Rodney Figaro
|
1c95a67334
|
12695 - add with adaptations All-In-One Reward module
|
2017-05-18 17:33:50 +02:00 |
|
Rodney Figaro
|
c033432a7c
|
Merge branch 'ticket/r12890-upgrade-give-a-gift-2'
|
2017-05-18 17:09:17 +02:00 |
|
Rodney Figaro
|
39c9259ee2
|
12890 - fix text and translations, hide gift PLV products if in cart
|
2017-05-12 18:28:21 +02:00 |
|
Rodney Figaro
|
b1ec03723e
|
Merge branch 'ticket/r13075-erp-fix-update-products'
|
2017-05-05 12:28:04 +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
|
26694f2ebd
|
13075 - erp add/update product - set nb_per_box at 12 by default
|
2017-05-03 17:50:48 +02:00 |
|
Rodney Figaro
|
b3b6531a2d
|
13046 - erp : fix default tva when adding new product
|
2017-04-27 17:57:10 +02:00 |
|
Rodney Figaro
|
6782d1212d
|
12890 - fix filtering give a gift by customer group
|
2017-04-27 17:45:19 +02:00 |
|
Rodney Figaro
|
cf1628a802
|
13075 - cleanup product sql update request
|
2017-04-21 12:04:12 +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
|
66309476cf
|
erp - fix nb per box from variant quantity
|
2017-04-21 11:43:59 +02:00 |
|
Rodney Figaro
|
b052df92c2
|
fix give a gift alignment in shopping cart
|
2017-04-21 10:45:46 +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
|
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 |
|
RoykinPROD
|
bce5c37e04
|
12949 - Take account of customers from Honk-Kong and China
|
2017-04-10 12:55:20 +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 |
|
RoykinPROD
|
8bcc63a40c
|
12817 - fix admin product js bug
|
2017-03-21 18:39:12 +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
|
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 |
|