Commit Graph

617 Commits

Author SHA1 Message Date
Michael RICOIS
5cf939fdcb Typo 2017-08-18 11:18:07 +02:00
Michael RICOIS
1763fbee30 Exclusif 2017-08-17 17:34:14 +02:00
Michael RICOIS
8063f5a2c8 DoubleCube Exclusif 2017-08-17 11:48:33 +02:00
Michael RICOIS
c977ace8f6 Add color select 2017-08-16 09:49:52 +02:00
Michael RICOIS
4d24cd486a Add txt column to store configuration 2017-08-16 09:45:38 +02:00
Michael RICOIS
98294fe69f Typo 2017-08-11 17:53:55 +02:00
Michael RICOIS
1a5122e671 Reload with color params 2017-08-11 17:46:04 +02:00
Michael RICOIS
63ba539e02 Check id_product 2017-08-11 17:45:40 +02:00
Michael RICOIS
56b40a7b6c Fix link 2017-08-11 15:40:42 +02:00
Michael RICOIS
7919942bb2 Gestion du BAT 2017-08-11 15:28:44 +02:00
Michael RICOIS
d3b113411b Ref image 2017-08-10 17:42:47 +02:00
Michael RICOIS
55ea0785ff doublecube-bicolor - chocos images 2017-08-10 17:26:54 +02:00
Michael RICOIS
f8450ea528 doublecube-bicolor - chocos images 2017-08-10 17:26:25 +02:00
Michael RICOIS
6be540f5d1 Change image name 2017-08-10 17:13:33 +02:00
Michael RICOIS
85bd1ae3e3 doublecube-bicolor - chocos images 2017-08-10 17:12:29 +02:00
Michael RICOIS
f13cba62d5 vrac-bicolor - images 2017-08-10 17:09:24 +02:00
Michael RICOIS
6c95e13023 sachet-bicolor - images 2017-08-10 17:09:05 +02:00
Michael RICOIS
49ba03cb74 pochette-bicolor - images 2017-08-10 17:06:45 +02:00
Michael RICOIS
6b04f72788 pochette-bicolor - damier image 2017-08-10 16:37:38 +02:00
Michael RICOIS
8d6ea41c60 Cleanup 2017-08-10 15:38:27 +02:00
Michael RICOIS
e865198614 vrac-thematique images 2017-08-10 12:58:31 +02:00
Michael RICOIS
adc0be48bb sachet-thematique images 2017-08-10 12:57:08 +02:00
Michael RICOIS
3e7b0b7624 Cleanup 2017-08-10 12:50:39 +02:00
Michael RICOIS
b95fc35eb6 Cleanup 2017-08-10 12:25:10 +02:00
Michael RICOIS
47ac773a88 facemapping 2017-08-10 11:41:28 +02:00
Michael RICOIS
3fa5b76790 Clean Up 2017-08-10 10:37:45 +02:00
Michael RICOIS
55fbad896d Files directory 2017-08-09 17:50:06 +02:00
Michael RICOIS
c44ac99979 CS 2017-08-09 17:00:31 +02:00
Michael RICOIS
96ec73bd47 Product with config and price/qty 2017-08-09 17:00:10 +02:00
Michael RICOIS
aa7f13c06a image 2017-08-09 11:18:05 +02:00
Michael RICOIS
61b2885290 Affichage des documents liée à la commande et création du dossier de
stockage
2017-08-09 11:04:20 +02:00
Michael RICOIS
2588605011 BAT : Add module addfileorder 2017-08-09 10:34:05 +02:00
Michael RICOIS
6258d3aaf1 Cleanup 2017-08-08 09:32:47 +02:00
Michael RICOIS
39ffdba897 Remove 2017-08-08 09:32:07 +02:00
Michael RICOIS
5885b8c419 Place image in upload/orders directory 2017-08-08 09:30:49 +02:00
Michael RICOIS
43277d948b Id order in upload 2017-08-08 09:30:22 +02:00
Michael RICOIS
a4af690cc1 Add mark to face with items as "Noms, Custom," 2017-08-07 15:19:18 +02:00
Michael RICOIS
71cbc59f00 Add background to simulator 2017-08-07 15:14:43 +02:00
Michael RICOIS
1ad4fcca68 Save configurator options as text 2017-08-07 12:44:59 +02:00
Michael RICOIS
4385237d29 Fix textarea placeholder value 2017-08-07 11:05:24 +02:00
Michael RICOIS
d18d41089f Change upload dir 2017-08-07 10:40:32 +02:00
Nolwenn
1bbf787c6c responsive + fix datepicker 2017-08-04 18:19:07 +02:00
Nolwenn
ccbf87470d Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-04 17:40:29 +02:00
Nolwenn
cf63059442 responsive + fixs page produit 2017-08-04 17:40:14 +02:00
Michael RICOIS
e6c19e0e15 Update image 2017-08-04 17:23:51 +02:00
Michael RICOIS
f7c291ecb5 Update image 2017-08-04 17:23:32 +02:00
Michael RICOIS
a6968cd011 Update bicolor 2017-08-04 16:30:43 +02:00
Michael RICOIS
ad42cd5e73 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-04 13:02:17 +02:00
Michael RICOIS
0412da090f base.tpl for reference 2017-08-04 12:41:23 +02:00
Michael RICOIS
d7e895300c Remove console.log 2017-08-04 12:40:58 +02:00
Michael RICOIS
a634cd4e39 Remove comment 2017-08-04 12:39:49 +02:00
Michael RICOIS
3220b2cd46 Remove comment 2017-08-04 12:38:59 +02:00
Michael RICOIS
3e99568e03 Upload file remember in html 2017-08-04 12:37:42 +02:00
Michael RICOIS
e484d3253d New override version 2017-08-04 12:36:48 +02:00
Michael RICOIS
4506bdac89 Spaces 2017-08-04 12:36:24 +02:00
Michael RICOIS
e429ca99ed OrderDetail override to save configurator 2017-08-04 12:36:04 +02:00
Nolwenn
39f61b365e fix fiche pro 2017-08-04 11:15:50 +02:00
Nolwenn
5c5de2f484 page listing + correctifs 2017-08-04 10:54:05 +02:00
Michael RICOIS
b0e55f5e25 Theme path dir 2017-08-04 10:32:25 +02:00
Michael RICOIS
98a85870bb Space 2017-08-04 10:28:07 +02:00
Michael RICOIS
0cdac57abb TYPO 2017-08-03 16:22:17 +02:00
Nolwenn
859ab25af9 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-03 14:54:18 +02:00
Nolwenn
f256354f89 page category + responsive 2017-08-03 14:54:09 +02:00
Michael RICOIS
de4d9b637b Configurator <=> Simulator 2017-08-03 14:46:25 +02:00
Michael RICOIS
3121da1733 Emballage 2017-08-03 14:46:10 +02:00
Nolwenn
b14cda785b category & produit 2017-08-03 13:10:18 +02:00
Michael RICOIS
cc0f9d4eaf Colorpicker 2017-08-03 13:01:39 +02:00
Michael RICOIS
8a9400c8bf Bicolor 2017-08-03 12:58:46 +02:00
Michael RICOIS
b5e26c85db Hidden fields 2017-08-03 12:58:29 +02:00
Michael RICOIS
210f87e276 Text default value 2017-08-03 12:10:15 +02:00
Michael RICOIS
a97ade3d27 Prepare doublecube exclusif 2017-08-03 11:59:10 +02:00
Michael RICOIS
a61a403826 Bicolor 2017-08-03 11:18:51 +02:00
Michael RICOIS
0171558587 Add fonts 2017-08-03 10:51:56 +02:00
Michael RICOIS
c95795ec1e pochette6-bicolor clean 2017-08-03 10:10:12 +02:00
Michael RICOIS
9cc14903e0 Parmètrage simulator 2017-08-03 10:02:18 +02:00
Michael RICOIS
a77e91cc15 Update Simulator tpl/js 2017-08-03 09:45:52 +02:00
Nolwenn
4fb438ca47 fix blocklayered et ajout cat admin img 2017-08-02 12:53:42 +02:00
Nolwenn
54e68a2f53 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-02 12:46:07 +02:00
Nolwenn
7f3efcbb5f debut category 2017-08-02 12:45:55 +02:00
Michael RICOIS
01a245596f Add error 2017-08-02 12:39:05 +02:00
Michael RICOIS
2dcffc5c1f fix column name 2017-08-02 12:26:14 +02:00
Michael RICOIS
c3ec0740ab Bicolor 2017-08-02 12:13:48 +02:00
Nolwenn
8249f9b773 fix champs configurator inside form 2017-08-02 10:41:40 +02:00
Nolwenn
327f326e8e Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-02 10:15:25 +02:00
Nolwenn
e1baebce05 fix class op- 2017-08-02 10:15:10 +02:00
Michael RICOIS
b414cf5f32 Suppression Image jpeg 2017-08-02 10:00:53 +02:00
Michael RICOIS
5295252a50 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-08-02 09:26:53 +02:00
Nolwenn
5401eb1711 page produit configurator 2017-08-01 19:41:36 +02:00
Michael RICOIS
4fb614c4c6 Configurator : Label/Separator 2017-08-01 18:03:05 +02:00
Michael RICOIS
9cc8afa40c image brillant.png 2017-08-01 17:28:17 +02:00
Nolwenn
b4f78bbff1 Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-08-01 16:10:35 +02:00
Nolwenn
4a8d6cac3d page produit 2017-08-01 16:10:25 +02:00
Michael RICOIS
26f7d3ba19 J'ai avancé 2017-08-01 16:09:05 +02:00
Michael RICOIS
35d4a76dca Admin template 2017-08-01 11:56:02 +02:00
Michael RICOIS
f5f982930d Change display 2017-08-01 11:55:37 +02:00
Michael RICOIS
55e9f20be0 Doublecube Thematique 2017-08-01 11:30:41 +02:00
Michael RICOIS
2ee6f45913 Fix copy items 2017-08-01 09:35:56 +02:00
Michael RICOIS
84e4add041 Add hook simulator 2017-07-31 16:01:07 +02:00
Michael RICOIS
1d1a013cb4 Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git 2017-07-31 15:49:42 +02:00
Nolwenn
811cb4062f fiche produit 2017-07-31 15:47:12 +02:00
Michael RICOIS
81212ff42f Admin Simulator 2017-07-31 12:10:21 +02:00
Nolwenn
853529b572 ajour product comment + modif catfeatured + add advreassurance 2017-07-31 11:39:32 +02:00
Nolwenn
be5408f45c Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage 2017-07-28 13:06:29 +02:00
Nolwenn
4cb8cbdf43 cms + 404 + pb contour btn 2017-07-28 13:06:15 +02:00
Michael RICOIS
522eb1aa4b Add configurator hook in product.tpl 2017-07-28 10:14:50 +02:00
Michael RICOIS
833255de53 Configurator small fix on display items 2017-07-28 10:12:49 +02:00
Nolwenn
b32ebc7e4b pages compte suite 2017-07-27 17:40:17 +02:00
Nolwenn
e2355bdaae logo img 2017-07-27 16:36:13 +02:00
Nolwenn
e4646d8365 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/chocolatdemariage into develop 2017-07-27 16:35:07 +02:00
Nolwenn
a21df7553f account + cms + tunnel fin 2017-07-27 16:34:51 +02:00
Michael RICOIS
de3bf0b321 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git into develop 2017-07-26 17:40:08 +02:00
Michael RICOIS
a051874922 Fix double association 2017-07-26 17:39:52 +02:00
Nolwenn
cb4fc6cece fix js + responsive 2017-07-26 10:55:19 +02:00
Michael RICOIS
bf65817872 Order options value 2017-07-26 10:47:30 +02:00
Michael RICOIS
f4293bf6d0 Order options value 2017-07-24 16:29:55 +02:00
Michael RICOIS
2be0c8038d Add visibility field value during copy 2017-07-24 16:29:37 +02:00
Michael RICOIS
233d9f7bb0 Fix impact id 2017-07-24 16:21:20 +02:00
Michael RICOIS
c4c4b97ab5 Prise en compte de la langue 2017-07-21 17:51:37 +02:00
Michael RICOIS
57ca4977c1 Fix language 2017-07-20 15:22:36 +02:00
Michael RICOIS
d588aa7531 Update module 2017-07-20 14:28:43 +02:00
Michael RICOIS
f80b1400b7 Update module antadisconfigurator 2017-07-17 14:54:03 +02:00
Nolwenn
4a5b59bcbf skin tunnel d achat 2017-07-13 17:26:13 +02:00
Nolwenn
acddf57791 debut menu + responsive 2017-07-12 15:05:18 +02:00
Michael RICOIS
ddae374181 Typo 2017-07-10 17:49:04 +02:00
Michael RICOIS
420cf6af4c Update configurator 2017-07-10 17:10:46 +02:00
Michael RICOIS
ee0ad618e2 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git into develop 2017-07-10 12:04:27 +02:00
Michael RICOIS
5a06ded2d5 Update configurator 2017-07-10 12:03:22 +02:00
Nolwenn
0c8a8110d2 page index suite 2017-07-07 20:01:01 +02:00
Nolwenn
a2f90949b9 advsitereviews fix sql 2017-07-06 18:13:38 +02:00
Nolwenn
5c193ee811 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/chocolatdemariage into develop 2017-07-06 17:41:28 +02:00
Nolwenn
b12885979f modules et override 2017-07-06 17:41:10 +02:00
Nolwenn
5dad7a2ff7 theme 2017-07-06 17:35:02 +02:00
Michael RICOIS
204bb6313a Fix optValue notice 2017-06-30 17:47:53 +02:00
Michael RICOIS
d5fe385ec8 DB_PREFIX 2017-06-30 15:08:11 +02:00
Michael RICOIS
1665ae8743 Add module logo 2017-06-29 16:12:22 +02:00
Michael RICOIS
76033b1433 Add hidden field 2017-06-29 16:11:40 +02:00
Michael RICOIS
abd4803948 Simulator AdminProductsExtra 2017-06-29 15:50:29 +02:00
Michael RICOIS
392a841b64 Return to the list 2017-06-29 15:48:06 +02:00
Michael RICOIS
d72ac80cb9 Fix sql install 2017-06-29 15:16:48 +02:00
Michael RICOIS
921dfaefb7 Add empty message 2017-06-28 17:52:28 +02:00
Michael RICOIS
aac54ce043 Remove label 2017-06-28 17:51:58 +02:00
Michael RICOIS
0394b895b2 Copy options product to product 2017-06-28 16:50:16 +02:00
Michael RICOIS
abf3cda54f Simulator : Doublecube bicolor 2017-06-28 16:49:08 +02:00
Michael RICOIS
5b0ed3d0f0 Clean js 2017-06-28 16:48:34 +02:00
Michael RICOIS
c480911b12 Simulator : doublecube bicolor 2017-06-28 12:20:57 +02:00
Michael RICOIS
40998c34b2 Update doc 2017-06-27 17:53:02 +02:00
Michael RICOIS
220c1a671b Harmonize class 2017-06-27 17:52:40 +02:00
Michael RICOIS
7adb1c26d7 Add reference in display 2017-06-27 17:09:47 +02:00
Michael RICOIS
7af93b1cc0 Add Double Cube images 2017-06-27 15:55:18 +02:00
Michael RICOIS
fd2322cd0e Update Module antadisconfigurator 2017-06-27 12:21:47 +02:00
Michael RICOIS
6e58d3d981 Remove assets in tpl 2017-06-27 11:48:02 +02:00
Michael RICOIS
8e703f8865 Create hookHeader for assets 2017-06-27 11:47:36 +02:00
Michael RICOIS
f8ca4dec9d Move getOptProductFlatten in ConfiguratorStorage 2017-06-27 11:26:08 +02:00
Michael RICOIS
3e25852ad9 Explication configuration 2017-06-27 11:05:00 +02:00
Michael RICOIS
14e062e993 Complete SQL on install and prepare hookHeader 2017-06-27 10:45:09 +02:00
Michael RICOIS
a352d59f03 Override update 2017-06-27 10:08:05 +02:00
Michael RICOIS
0c49237644 Remove ajax test 2017-06-27 10:07:23 +02:00
Michael RICOIS
e4932bf8aa Delete Unused override 2017-06-26 16:45:10 +02:00
Michael RICOIS
6be10897bb Disable thumbnail generation 2017-06-26 15:36:19 +02:00
Michael RICOIS
d9d1ed9767 Get input data back from basket to product 2017-06-26 15:22:41 +02:00
Michael RICOIS
aaee18e873 Override Link 2017-06-26 12:14:57 +02:00
Michael RICOIS
2e67b7857e Prepare for preprod 2017-06-26 12:13:19 +02:00
Michael RICOIS
397191866c Prepare for preprod 2017-06-26 12:12:22 +02:00
Michael RICOIS
14f4f4c1e6 Add FileUpload 2017-06-23 17:07:55 +02:00
Michael RICOIS
cab2e343ab Fix value define by user 2017-06-23 14:16:07 +02:00
Michael RICOIS
f7768dd622 Fix value define by user 2017-06-23 14:15:47 +02:00
Michael RICOIS
54af11247a Display tab on "Back to product" 2017-06-23 10:58:28 +02:00
Michael RICOIS
a39fe023cd Add now in date value 2017-06-23 10:42:13 +02:00
Michael RICOIS
0857893eb0 Configurator view details 2017-06-23 09:47:00 +02:00
Michael RICOIS
85e96d842d Update README 2017-06-22 17:22:17 +02:00
Michael RICOIS
a3fae34b42 image sachet oriental 2017-06-22 16:03:33 +02:00
Michael RICOIS
c1e85bc76b image sachet tendance 2017-06-22 16:02:31 +02:00
Michael RICOIS
240208040a image sachet chocos 2017-06-22 16:01:25 +02:00
Michael RICOIS
30846e1d52 image sachet vintage 2017-06-22 15:59:52 +02:00
Michael RICOIS
941764f1ac image sachet voyage 2017-06-22 15:58:41 +02:00
Michael RICOIS
2617a7c888 Define image name 2017-06-22 12:17:25 +02:00
Michael RICOIS
cebc5d1597 Define image name 2017-06-22 12:15:06 +02:00
Michael RICOIS
6d64de6c4b Add override 2017-06-22 10:03:24 +02:00
Michael RICOIS
b61695f066 Translations 2017-06-22 10:02:39 +02:00
Michael RICOIS
8c02632d37 Display simulator in product 2017-06-22 09:41:55 +02:00
Michael RICOIS
52ea5ce77d Simulation Assets 2017-06-22 09:40:23 +02:00
Michael RICOIS
9373cb2b32 Prepare integration 2017-06-22 09:39:42 +02:00
Michael RICOIS
d447331164 Add hidden and file fields 2017-06-22 09:37:34 +02:00
Michael RICOIS
6b5d4aa044 Add sql for simulator 2017-06-22 09:35:46 +02:00
Michael RICOIS
ca72852e7c CSS 2017-06-21 17:54:10 +02:00
Michael RICOIS
805b7e9142 Colorpicker lib 2017-06-21 16:21:03 +02:00
Michael RICOIS
1fa4bc5f3b Add colorpicker 2017-06-21 16:20:46 +02:00
Michael RICOIS
0b9b42e903 Sachet thematique 2017-06-21 14:21:50 +02:00
Michael RICOIS
529f051d5e hook Header to display global var, js, css 2017-06-20 17:47:51 +02:00
Michael RICOIS
20b9c3adc1 vrac et sachet tpl 2017-06-20 17:07:07 +02:00
Michael RICOIS
99af351f78 Start manage theme 2017-06-20 16:41:01 +02:00
Michael RICOIS
25932db4ea Can't have two setMedia override 2017-06-20 11:35:36 +02:00
Michael RICOIS
42cfff492f Simulator 2017-06-20 11:11:51 +02:00
Michael RICOIS
c72d06ea84 Error text 2017-06-19 12:22:54 +02:00
Michael RICOIS
02a848bf7c Merge branch 'configurator' into develop 2017-06-15 13:00:47 +02:00
Michael RICOIS
ba01e0c9f6 Add default value for price 2017-06-15 13:00:11 +02:00
Michael RICOIS
c0748c4387 Create database 2017-06-15 12:52:59 +02:00
Michael RICOIS
1c150bbd3c Translation 2017-06-15 11:35:35 +02:00
Michael RICOIS
ffda188e9f Typo 2017-06-15 11:34:32 +02:00
Michael RICOIS
2d13f03a2f Override Install 2017-06-15 10:31:34 +02:00
Michael RICOIS
404e5dde4c Update templates to work with antadisconfigurator 2017-06-15 09:19:03 +02:00
Michael RICOIS
4f556b73fb Datepicker 2017-06-14 18:21:53 +02:00
Michael RICOIS
93d6c17f23 Check 2017-06-14 15:37:05 +02:00
Michael RICOIS
d4edd05e5d Rework on module 2017-06-14 15:14:07 +02:00
Michael RICOIS
b21ec24c23 Add db 2017-06-13 16:51:44 +02:00
Michael RICOIS
27f1d82930 database 2017-06-13 16:49:08 +02:00
Michael RICOIS
338e173fdd Change 2017-06-13 16:48:15 +02:00
Michael RICOIS
29f6095f5d Redirect after update 2017-06-12 16:12:09 +02:00
Michael RICOIS
6305ff9839 Manage product delete, qty up and down in cart 2017-06-12 15:28:43 +02:00
Michael RICOIS
da5b385559 Doc 2017-06-09 17:55:37 +02:00
Michael RICOIS
eced03fa28 Order display 2017-06-09 17:55:17 +02:00
Michael RICOIS
8ebf7fc91a Display options in order 2017-06-09 14:35:12 +02:00
Michael RICOIS
bb0cd81cbe Remove toolbar btn 2017-06-09 11:24:08 +02:00
Michael RICOIS
987cd037d7 Validation, help and more 2017-06-09 11:10:25 +02:00
Michael RICOIS
21cd725307 Add module antadisconfigurator + specific 2017-06-08 12:23:50 +02:00
Michael RICOIS
3c9a8fa5cf Delete install directory 2017-06-07 17:11:02 +02:00
Michael RICOIS
f46be40623 Init 2017-06-07 16:31:24 +02:00