Rodney Figaro
|
1e1d58d7ea
|
Merge branch 'ticket/r12695-allinonereward' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12695-allinonereward
|
2017-03-24 10:55:06 +01:00 |
|
root
|
9c6b53ceeb
|
skin all in one + mail
|
2017-03-24 09:52:14 +00:00 |
|
Rodney Figaro
|
16907e9c17
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12695-allinonereward
|
2017-03-23 12:54:49 +01:00 |
|
root
|
7e64106487
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into dev
|
2017-03-21 17:39:42 +00:00 |
|
RoykinPROD
|
8bcc63a40c
|
12817 - fix admin product js bug
|
2017-03-21 18:39:12 +01:00 |
|
Rodney Figaro
|
84a0001706
|
Merge branch 'master' into dev
|
2017-03-20 09:19:51 +01:00 |
|
Rodney Figaro
|
8cfae2c019
|
make gift/promo id product configurable in settings.erp.inc
|
2017-03-20 09:19:27 +01:00 |
|
Rodney Figaro
|
5c41070458
|
add all-in-one reward module (not modified, original version)
|
2017-03-16 14:06:13 +01:00 |
|
Rodney Figaro
|
f6d0d7a1c2
|
disable synchro button in adm order
|
2017-03-16 12:08:00 +01:00 |
|
Rodney Figaro
|
fac0185cd9
|
make erp activable or not, centralize credentials (not in repo)
|
2017-03-16 11:40:07 +01:00 |
|
RoykinPROD
|
dd3b15996d
|
fix : enable erp (disabled for dev)
|
2017-03-14 10:34:51 +01:00 |
|
root
|
6e7d018592
|
fix bug in price.toFixed in tools.js
|
2017-03-13 15:07:41 +00:00 |
|
Rodney Figaro
|
68a4ded2b2
|
use tax in gifts sentences and update translations in french
|
2017-03-13 14:45:19 +01:00 |
|
Rodney Figaro
|
d35a6c5801
|
12411 - lock the gift product quantity in shopping cart
|
2017-03-13 12:14:31 +01:00 |
|
Rodney Figaro
|
08a80d8eba
|
12411 - fix unused variable
|
2017-03-10 17:42:03 +01:00 |
|
Rodney Figaro
|
cb3fcbcace
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12411-giveagift
|
2017-03-10 17:38:19 +01:00 |
|
RoykinPROD
|
c130a76aa1
|
fix phone number checking in erp customer
|
2017-03-10 17:37:05 +01:00 |
|
root
|
9dfbbccac1
|
remove prop disabled to fix chrome lag
|
2017-03-09 16:50:42 +01:00 |
|
root
|
730ee28e5c
|
fix giveagift unique selection, but per amount ranges
|
2017-03-03 08:10:09 +00:00 |
|
Rodney Figaro
|
5599c75e4c
|
fix merge branches
|
2017-03-02 17:56:38 +01:00 |
|
Rodney Figaro
|
9221835ce6
|
fix advslider by upgrading flexslider, adding flexslider.css and fixing height in css
|
2017-03-02 13:11:30 +01:00 |
|
root
|
50a175b140
|
#12411 - add theme give a gift and update integration
|
2017-02-17 09:45:59 +00:00 |
|
Rodney Figaro
|
5a8926ec78
|
fix undefined variables in history.tpl
|
2017-02-08 17:38:09 +01:00 |
|
Rodney Figaro
|
68f8e1eb51
|
add ERP mock objects for testing orders without real ERP
|
2017-02-08 17:31:41 +01:00 |
|
Rodney Figaro
|
71db3fc055
|
enable or disable the erporder in defines.inc.php - disabled here
|
2017-02-08 15:37:01 +01:00 |
|
Rodney Figaro
|
1286c72a02
|
add HOOK_SHOPPING_CART in shopping-cart.tpl
|
2017-02-08 15:36:14 +01:00 |
|
Rodney Figaro
|
561b023b6e
|
add giveagift module
|
2017-02-08 15:31:34 +01:00 |
|
Rodney Figaro
|
df33228963
|
fix undefined variables in shopping-cart.tpl
|
2017-02-08 12:41:09 +01:00 |
|
Rodney Figaro
|
5102032929
|
fix undefined variables in product-list.tpl
|
2017-02-08 11:47:20 +01:00 |
|
Rodney Figaro
|
d40c3f056c
|
fix modules xml cache creation
|
2017-02-08 10:56:57 +01:00 |
|
root
|
08ae7ce78d
|
#12284 - fix IE background color bug
|
2017-02-06 14:07:33 +00:00 |
|
root
|
3aceec3434
|
#12038 - add advslider and update tpl/css integration to display an advertising block
|
2017-02-03 09:20:22 +00:00 |
|
root
|
7a3a9b161a
|
12425 - fix too slow loading, optimise computation of product price
|
2017-02-02 10:50:13 +01:00 |
|
root
|
cfa9472639
|
change additional register email when erp add a new customer
|
2017-02-02 10:37:41 +01:00 |
|
root
|
2a5c988bce
|
commit changes made during the last 2 months
|
2017-01-26 10:34:09 +01:00 |
|
PLESK5
|
58c8eb20c1
|
fix pb group synchro
|
2016-11-24 11:38:53 +01:00 |
|
PLESK5
|
e6fa0f403b
|
fix pb créa decli
|
2016-11-22 16:32:27 +01:00 |
|
PLESK5
|
7b9e5ef617
|
modif
|
2016-11-22 16:32:03 +01:00 |
|
PLESK5
|
8c9d82c349
|
update erp address
|
2016-11-02 17:12:41 +01:00 |
|
PLESK5
|
2435f12abf
|
add country to synchro
|
2016-11-02 17:12:14 +01:00 |
|
PLESK5
|
46978baba5
|
update prod
|
2016-10-21 11:41:16 +02:00 |
|
PLESK5
|
70884dcea0
|
add synchro erp action
|
2016-10-21 11:39:37 +02:00 |
|
PLESK5
|
821c2c37b7
|
modif b2bill
|
2016-10-21 11:39:06 +02:00 |
|
PLESK5
|
4a874a80f2
|
translate
|
2016-10-21 11:38:33 +02:00 |
|
PLESK5
|
0f113d1850
|
add override
|
2016-10-21 11:37:55 +02:00 |
|
PLESK5
|
64ecf8aea2
|
update module erp
|
2016-10-21 11:37:36 +02:00 |
|
PLESK5
|
4c43f88e5b
|
modif erp files
|
2016-10-21 11:37:19 +02:00 |
|
PLESK5
|
a170fc8de3
|
change mail
|
2016-10-21 11:36:48 +02:00 |
|
PLESK5
|
a303bccbc8
|
change define
|
2016-10-21 11:36:08 +02:00 |
|
PLESK5
|
664e30f3f1
|
add synchro erp status in bo
|
2016-10-21 11:35:18 +02:00 |
|