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
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
Rodney Figaro
66b68af7bd
Merge branch 'ticket/r12615-domtom' into dev
2017-03-17 12:39:51 +01:00
Rodney Figaro
71f2537e37
12615 - add specific message in step 1 and change behavior in step 1 and 2
2017-03-17 12:39:37 +01:00
Rodney Figaro
4d8b60dd9f
Merge branch 'ticket/r12615-domtom' into dev
2017-03-17 10:58:05 +01:00
Rodney Figaro
c8b204e35d
12615 - remove automatically ups product from cart, change text displayed in delivery step
2017-03-17 10:57:46 +01:00
Rodney Figaro
26df073ef8
11971 - add id_employee in parameters backup
2017-03-15 18:08:08 +01:00
Rodney Figaro
2f7bd648a4
11971 - fix syntax error
2017-03-15 17:45:42 +01:00
Rodney Figaro
b071701042
fix php5.5 compatibility
2017-03-15 17:40:40 +01:00
Rodney Figaro
e0a531073b
add antstatmarket module
2017-03-15 17:18:56 +01:00
Rodney Figaro
5501f37d2d
12615 - ensure that the UPS restriction takes account of the selected address delivery
2017-03-15 10:33:06 +01:00
Rodney Figaro
614471df95
12615 - improve checking cart on UPS undeliverable products
2017-03-15 09:30:31 +01:00
Rodney Figaro
8af3a3c92b
Merge branch 'dev' into ticket/r12615-domtom
2017-03-14 18:18:43 +01:00
Rodney Figaro
8cc2b2efc4
12615 - hide continue button to payment step until js processing has finished
2017-03-14 18:14:13 +01:00
Rodney Figaro
5b743533f9
fix adress selection
2017-03-14 16:39:35 +01:00
Rodney Figaro
7688337913
12615 - deals with addresses in "DOM-TOM", add message when carrier restricted product in cart
2017-03-14 13:12:52 +01:00
PLESK5
50861a7f09
Merge branch 'module_training' into dev
2017-03-14 10:19:32 +01:00
PLESK5
d18f0e6eff
save new translations in garanciavap module
2017-03-14 10:16:42 +01:00
Rodney Figaro
9e2295a786
add "save and stay" button in garancia vap
2017-02-27 17:09:05 +01:00
PLESK5
34fb77e0dc
save changes made on images in theme and garanciavap translations
2017-02-09 15:19:16 +01:00
PLESK5
28d21f61b3
delete image before resizing it in gift card admin
2017-02-09 15:19:16 +01:00
PLESK5
b746ac7693
fix conflicts
2017-02-09 15:18:17 +01:00
Rodney Figaro
d1c9852aad
#12344 - fix overrided cartrule cart total selection
2017-02-09 15:12:27 +01:00
Rodney Figaro
1f1ffbcdd2
Fix bug core prestashop on accentued characters in str2url
2017-02-09 12:30:10 +01:00
Rodney Figaro
d272281a77
export also uncorrected codes into the corrected codes csv
2017-02-07 17:33:20 +01:00
Rodney Figaro
acf5c42a55
fix uninstalling module
2017-02-07 17:27:38 +01:00
Rodney Figaro
0bea981f01
export corrected codes along with the "bilan" and the corrected results, change headers
2017-02-07 17:24:44 +01:00
Rodney Figaro
50e63ebef7
fix duplicated error codes during db updating, codes/categories/modules comparisons, add info
2017-02-07 11:29:39 +01:00
Rodney Figaro
db89bbed48
export corrected results and import fixed codes
...
more changes :
- show links to download these files rather than presenting the download dialog
- add description about required columns in every imported files
- stores "bilan" and corrected results in a dedicated folder : "output"
2017-02-06 12:26:14 +01:00
Rodney Figaro
39f3ba1314
affect automatically real column indexes to expected header
2017-01-25 15:13:11 +01:00
Rodney Figaro
86c2f56573
improve csv reader delimiter auto detection
2017-01-25 15:01:00 +01:00
Rodney Figaro
a3300f7224
remove enclosing quotes in CSVWriter in each cells of the CSV string
2017-01-25 12:39:04 +01:00
Rodney Figaro
4115263bf5
fix upload limit
2017-01-25 12:33:12 +01:00
Rodney Figaro
d239164e7e
optimize undefined codes saving in DB, add auto detect in CSV Reader, make some fixes
2017-01-25 12:30:53 +01:00
Rodney Figaro
472b6c5b95
optimize insert modules/categories and pharmacy in DB when importing csv file
2017-01-25 11:23:10 +01:00
Rodney Figaro
9a01a412c9
remove ObjectModelExtended (compatibility with php 5.5)
2017-01-25 10:46:35 +01:00
