root
|
e3586bc563
|
fix logo path
|
2017-06-02 17:40:39 +02:00 |
|
root
|
c0cabc53ff
|
page d attente
|
2017-06-02 17:24:34 +02:00 |
|
Rodney Figaro
|
6d0d4e4c59
|
13372 - change default subcategory of TPD Belge
|
2017-05-31 09:07:19 +02:00 |
|
Rodney Figaro
|
46f9628ebb
|
13372 - add category TPD Belge in menu
|
2017-05-31 09:05:10 +02:00 |
|
Rodney Figaro
|
72e8320cc8
|
13372 - add PLV and PLV_ALL categories
|
2017-05-30 18:36:44 +02:00 |
|
Rodney Figaro
|
582faf57d1
|
13265 - in shopping cart, replace "bottle" by product unity
|
2017-05-30 18:22:42 +02:00 |
|
Rodney Figaro
|
62ade27516
|
13265 - replace text "bottle" by product unity in product list
|
2017-05-30 18:18:12 +02:00 |
|
Rodney Figaro
|
e33755356c
|
13144 - fix double click bug when validating bankwire and cheque payment (causes 2 orders to be created)
|
2017-05-29 16:17:47 +02:00 |
|
Rodney Figaro
|
b3e4001f3b
|
13144 - fix form closed twice in payment bankwire tpl
|
2017-05-29 12:23:42 +02:00 |
|
Rodney Figaro
|
265669090f
|
13144 - fix undefined variable in ripcord
|
2017-05-24 16:40:09 +02:00 |
|
Rodney Figaro
|
8a95c6e742
|
13144 - fix null variable used as an array in be2bill
|
2017-05-24 12:07:21 +02:00 |
|
Rodney Figaro
|
4754304b28
|
Merge branch 'fix_erp_mailer'
|
2017-05-24 10:54:49 +02:00 |
|
Rodney Figaro
|
e8016490ed
|
Merge branch 'ticket/r13161-remove-guest-in-emails'
|
2017-05-24 10:51:00 +02:00 |
|
Rodney Figaro
|
e747d2b070
|
Merge branch 'ticket/r13265-hide-product-text'
|
2017-05-22 18:38:57 +02:00 |
|
Rodney Figaro
|
c1f17ce187
|
13161 - remove "guest" mentions in all emails
|
2017-05-19 15:52:15 +02:00 |
|
Rodney Figaro
|
69616fc8b1
|
12695 - add link "my rewards" in block account
|
2017-05-18 17:49:30 +02:00 |
|
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
|
bf57e47971
|
13265 - Hide text "nb bottle" in shopping cart
|
2017-05-12 17:54:05 +02:00 |
|
Rodney Figaro
|
0c826b02b2
|
13265 - adapt prices displayed
|
2017-05-12 17:49:54 +02:00 |
|
Rodney Figaro
|
e413125621
|
13265 - fix product text
|
2017-05-12 17:46:01 +02:00 |
|
Rodney Figaro
|
63266300b3
|
13265 - remove "sale by box" for product with 1 article
|
2017-05-12 17:42:31 +02:00 |
|
Rodney Figaro
|
d318c73293
|
prevent mails from being sent when customers are created during the erp synchro in PREPROD
|
2017-05-12 16:32:24 +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 |
|