Michael RICOIS
cbaff31614
Remove debug
2017-06-06 11:32:04 +02:00
Michael RICOIS
b2b125f4ce
Override OrderConfirmationController weborama
2017-06-02 15:50:06 +02:00
Michael RICOIS
41c4c13089
Add Tag weborama
2017-06-02 15:36:20 +02:00
Michael
ead411f255
Merge branch 'ticket/r13147-product-fidelity' into 'master'
...
Ticket/r13147 product fidelity
See merge request !1
2017-05-31 11:50:17 +02:00
PLESK5
e37624166e
traduction
2017-05-29 14:24:23 +02:00
PLESK5
1ed43c0ce1
change gitignore
2017-05-29 14:23:51 +02:00
PLESK5
92684d65bb
paypal update
2017-05-29 14:23:01 +02:00
PLESK5
58257e743d
remove devspepresse
2017-05-29 14:22:52 +02:00
PLESK5
cbeb81421e
fix ftp send
2017-05-29 14:21:36 +02:00
Michael RICOIS
1876d12119
Add two categories for list
2017-05-29 12:58:33 +02:00
Michael RICOIS
75c06c7853
Cleanup
2017-05-29 12:33:38 +02:00
Michael RICOIS
46cfa2b8f3
Configure fidelity
...
- Add a new category "Offre de fidélité - Liste de choix"
- Move it near "Offre de fidélité"
- Copy product between the two category
- Configure in admin "Préférences > Produits"
2017-05-29 12:21:32 +02:00
PLESK5
0f7fb86c84
fix mr
2017-05-05 10:51:48 +02:00
Rodney Figaro
cce0dd2d56
12852 - fix submit.php (duplicate default in switch case)
2017-04-20 18:33:40 +02:00
Rodney Figaro
fff52d067b
12852 - fix ensure at least the standard order info is passed to validate order
2017-04-20 16:16:11 +02:00
Rodney Figaro
25cc700939
12852 - fix order_info missing data in systempay
2017-04-20 16:00:46 +02:00
Rodney Figaro
8c5e6bffe3
Merge branch 'module_training_encoding'
2017-04-13 13:05:32 +02:00
Rodney Figaro
6e736247bd
module training - remove unecessary argument in cleanup method
2017-04-13 13:04:54 +02:00
Rodney Figaro
2bc227a188
module training - add a function to clean up all clients codes and harmonize all clients codes processing in the tool
2017-04-13 09:19:23 +02:00
Rodney Figaro
d1d07a4dec
Merge branch 'module_training_encoding'
2017-04-12 17:22:27 +02:00
Rodney Figaro
a94bf13b89
module training - remove BOM and convert to ISO-8859-1 in CSV writing
2017-04-12 17:21:29 +02:00
PLESK5
de0e0cf3b7
save blockbestsellers modif
2017-04-12 15:48:30 +02:00
Rodney Figaro
613ba6398c
add UTF-8 Byte order mark when writing CSV
2017-04-12 15:45:21 +02:00
Rodney Figaro
2735a2fbcd
Merge branch 'fix_training'
2017-03-30 09:31:51 +02:00
Rodney Figaro
87fe55d4e7
module training - clean code with trims and fix one SQL method
2017-03-30 09:25:52 +02:00
Rodney Figaro
03caf86516
module training - trim all imported CSV cells
2017-03-30 09:09:07 +02:00
PLESK5
f5619c158f
module training - fix by trimming client codes
2017-03-30 08:59:16 +02:00
Rodney Figaro
0361b2746a
module training - enlarge the encoding checking
2017-03-27 11:58:26 +02:00
Rodney Figaro
f62cf68e0a
Detect UTF-8/ISO-8859-1 encoding when reading csv files, re-encode them to UTF-8
2017-03-27 10:59:29 +02:00
PLESK5
b252f6ba5c
module training add dirs output, upload
2017-03-23 17:29:25 +01:00
Rodney Figaro
a7e32b448f
Merge branch 'master' of gitlab.antadis.net:dev-antadis/garancia
2017-03-23 17:23:59 +01:00
PLESK5
da1a7bb8a7
save translation (antstatmarket, garanciavap)
2017-03-23 17:23:43 +01:00
Rodney Figaro
8867a8c80e
Merge branch 'master' of gitlab.antadis.net:dev-antadis/garancia
2017-03-23 17:22:21 +01:00
Rodney Figaro
686ea216aa
Merge branch 'module_training'
2017-03-23 17:21:38 +01:00
Rodney Figaro
0c72608349
module training - replace expected column "Status" by "Statut"
2017-03-23 17:19:36 +01:00
Rodney Figaro
db55d992b3
module training - count results with new column "Status", columns "nb... slides" not required anymore
2017-03-23 16:02:10 +01:00
Rodney Figaro
9cb93b6ccf
module training - export csv with ";" instead of "," as column delimiter
2017-03-23 15:23:52 +01:00
PLESK5
f36d037c9a
save theme images changes
2017-03-20 09:48:42 +01:00
Rodney Figaro
e287172313
restore module training in dev
2017-03-20 09:38:44 +01:00
Rodney Figaro
fcab3d6494
Merge branch 'master' into dev
2017-03-20 09:34:32 +01:00
Rodney Figaro
eb2f72dd71
Merge branch 'master' into ticket/r11971-export-kpis
2017-03-20 09:30:40 +01:00
PLESK5
9d235ff67f
remove training module from master
2017-03-17 16:23:43 +01:00
Rodney Figaro
a6529e61d0
Merge branch 'master' of gitlab.antadis.net:dev-antadis/garancia
2017-03-17 16:16:00 +01:00
PLESK5
28696fbb3c
save changes in mavap images
2017-03-17 16:15:37 +01:00
Rodney Figaro
14c2dc18a6
Merge branch 'ticket/r12615-domtom' into dev
2017-03-17 15:57:28 +01:00
Rodney Figaro
dd052d38b7
12615 - change UPS product in cart warning msg in french and english
2017-03-17 15:57:12 +01:00
Rodney Figaro
b2088d6bf9
Merge branch 'ticket/r12615-domtom' into dev
2017-03-17 13:31:03 +01:00
Rodney Figaro
865186b44d
12615 - remove msg from step 1 when removing product - fix removing product from cart
2017-03-17 13:30:49 +01:00
Rodney Figaro
e73f3be035
Merge branch 'ticket/r12615-domtom' into dev
2017-03-17 12:47:35 +01:00
Rodney Figaro
b35bede08c
12615 - update english text in step 1
2017-03-17 12:47:26 +01:00
