Rodney Figaro
|
7bfbbecd06
|
Merge branch 'ticket/r13075-erp-fix-update-products' into dev
|
2017-05-05 11:41:30 +02:00 |
|
Rodney Figaro
|
384c5ba69a
|
13075 - remove updating nb_per_box in erp_update_product
|
2017-05-05 11:41:21 +02:00 |
|
Rodney Figaro
|
14b6c35903
|
Merge branch 'ticket/r13075-erp-fix-update-products' into dev
|
2017-05-03 17:50:58 +02:00 |
|
Rodney Figaro
|
26694f2ebd
|
13075 - erp add/update product - set nb_per_box at 12 by default
|
2017-05-03 17:50:48 +02:00 |
|
Rodney Figaro
|
2b28851bf7
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-28 12:25:25 +02:00 |
|
Rodney Figaro
|
1e15cc999a
|
12695 - increase font size of the text displayed in cart summary
|
2017-04-28 12:25:03 +02:00 |
|
Rodney Figaro
|
be34cd8eb3
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-27 18:42:45 +02:00 |
|
Rodney Figaro
|
e6d5829a21
|
12695 - display voucher code input bloc even if voucher has been entered
|
2017-04-27 18:42:37 +02:00 |
|
Rodney Figaro
|
742285b162
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-27 18:13:50 +02:00 |
|
Rodney Figaro
|
03a449b4a9
|
12695 - replace in translation "recompenses" by "avoirs" in rewards account front page
|
2017-04-27 18:13:39 +02:00 |
|
Rodney Figaro
|
7b93b6fb2b
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-27 18:09:25 +02:00 |
|
Rodney Figaro
|
3cdd2cf5ea
|
12695 - change text in shopping cart when no fidelity is possible
|
2017-04-27 18:09:15 +02:00 |
|
Rodney Figaro
|
25c1eebe36
|
Merge branch 'ticket/r13064-automatic-tva' into dev
|
2017-04-27 17:57:20 +02:00 |
|
Rodney Figaro
|
b3b6531a2d
|
13046 - erp : fix default tva when adding new product
|
2017-04-27 17:57:10 +02:00 |
|
Rodney Figaro
|
d22dc86e3d
|
Merge branch 'ticket/r12890-upgrade-give-a-gift-2' into dev
|
2017-04-27 17:45:28 +02:00 |
|
Rodney Figaro
|
6782d1212d
|
12890 - fix filtering give a gift by customer group
|
2017-04-27 17:45:19 +02:00 |
|
Rodney Figaro
|
2ec644a69c
|
Merge branch 'ticket/r13075-erp-fix-update-products' into dev
|
2017-04-21 12:04:22 +02:00 |
|
Rodney Figaro
|
cf1628a802
|
13075 - cleanup product sql update request
|
2017-04-21 12:04:12 +02:00 |
|
Rodney Figaro
|
5af89d532e
|
Merge branch 'ticket/r13075-erp-fix-update-products' into dev
|
2017-04-21 11:54:39 +02:00 |
|
Rodney Figaro
|
76dbdf24e2
|
13075 - erp -do not update nb per box if variante and article empty
|
2017-04-21 11:54:31 +02:00 |
|
Rodney Figaro
|
7ae2ff628b
|
Merge branch 'ticket/r13075-erp-fix-update-products' into dev
|
2017-04-21 11:44:09 +02:00 |
|
Rodney Figaro
|
66309476cf
|
erp - fix nb per box from variant quantity
|
2017-04-21 11:43:59 +02:00 |
|
Rodney Figaro
|
a393c22970
|
Merge branch 'fix_give_a_gift' into dev
|
2017-04-21 10:46:02 +02:00 |
|
Rodney Figaro
|
b052df92c2
|
fix give a gift alignment in shopping cart
|
2017-04-21 10:45:46 +02:00 |
|
Rodney Figaro
|
9300802f70
|
Merge branch 'ticket/r13075-erp-fix-update-products' into dev
|
2017-04-21 10:39:13 +02:00 |
|
Rodney Figaro
|
ad4f59d0e7
|
13075 - use nb_per_box from variants rather than article (since the latter is now empty)
|
2017-04-21 10:39:05 +02:00 |
|
Rodney Figaro
|
5b0c0ecf71
|
add ERP_PREPROD part in erp add/update customer
|
2017-04-21 09:13:43 +02:00 |
|
RoykinPROD
|
733f9bcaea
|
13075 - Set nb_per_box by default at 12 when no value is defined in erp add/update product scripts
|
2017-04-21 09:11:07 +02:00 |
|
Rodney Figaro
|
6520bdb78d
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-19 17:34:21 +02:00 |
|
Rodney Figaro
|
d3815878a2
|
12695 - restore previous text "Add some products..." in shopping cart
|
2017-04-19 17:34:11 +02:00 |
|
Rodney Figaro
|
db49038494
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-19 17:24:13 +02:00 |
|
Rodney Figaro
|
23009b7d08
|
12695 - save translations
|
2017-04-19 17:24:05 +02:00 |
|
Rodney Figaro
|
9dd40d2d78
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-19 17:16:53 +02:00 |
|
Rodney Figaro
|
a3192820d0
|
12695 - add link to rewards in block account, fix give a gift shopping-cart display issue
|
2017-04-19 17:16:44 +02:00 |
|
Rodney Figaro
|
e7281a7a34
|
12695 - Fixes all-in-one reward integration in shopping cart
|
2017-04-19 16:33:47 +02:00 |
|
Rodney Figaro
|
ecb330844f
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12695-allinonereward
|
2017-04-19 15:45:56 +02:00 |
|
Rodney Figaro
|
965382262f
|
Merge branch 'ticket/r12890-upgrade-give-a-gift' into dev
|
2017-04-19 13:01:39 +02:00 |
|
Rodney Figaro
|
582f30ef01
|
12890 - give a gift - filter gifts by customer groups and cart product categories, add BO configuration
|
2017-04-19 13:01:30 +02:00 |
|
Rodney Figaro
|
8bb6a2cc1b
|
fix conflicts
|
2017-04-11 15:18:25 +02:00 |
|
RoykinPROD
|
bce5c37e04
|
12949 - Take account of customers from Honk-Kong and China
|
2017-04-10 12:55:20 +02:00 |
|
Rodney Figaro
|
d77f4da0af
|
Merge branch 'master' into dev
|
2017-03-29 17:40:27 +02:00 |
|
Rodney Figaro
|
72cc40772a
|
12871 - add checking on each record
|
2017-03-29 17:39:52 +02:00 |
|
Rodney Figaro
|
0cb55a1501
|
12871 - Send new client registering email to its representant
|
2017-03-29 17:37:12 +02:00 |
|
root
|
7b3e160f86
|
12756 - fix emails filtering in erp
|
2017-03-29 11:32:53 +00:00 |
|
root
|
2a8ac9dec0
|
Merge branch 'dev' of gitlab.antadis.net:dev-antadis/roykin into dev
|
2017-03-29 07:16:34 +00:00 |
|
Rodney Figaro
|
9426808c2e
|
Merge branch 'fix_preprod_erp' into dev
|
2017-03-29 09:05:54 +02:00 |
|
Rodney Figaro
|
00bd2d11b3
|
12756 - add PREPROD MODE, anonymize email erp - presta, except test emails from antadis and roykin
|
2017-03-29 09:05:19 +02:00 |
|
Rodney Figaro
|
455145cef7
|
12695 - add link to rewards account in shopping cart + translations
|
2017-03-24 18:14:55 +01:00 |
|
root
|
33f9aaf2bd
|
12695 - override allinone_reward to use the theme emails rather than the module emails
|
2017-03-24 16:08:21 +00:00 |
|
Rodney Figaro
|
e791aa768b
|
Merge branch 'dev' of gitlab.antadis.net:dev-antadis/roykin into dev
|
2017-03-24 11:11:29 +01:00 |
|