RoykinPROD
|
6cead6e18d
|
fix roykin id as default category
|
2017-06-07 15:21:29 +02:00 |
|
Rodney Figaro
|
049dd002aa
|
fix default menu
|
2017-06-07 12:31:42 +02:00 |
|
Rodney Figaro
|
e4d60371af
|
fix conflicts
|
2017-06-07 11:06:58 +02:00 |
|
root
|
74f51c4e3f
|
change bg submenu
|
2017-06-02 16:37:21 +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
|
8dbf4f6ade
|
13161 - changes pictos/icons (mails, site) and texts
|
2017-05-17 11:15:52 +02:00 |
|
Rodney Figaro
|
9e506a1a3c
|
13161 - changes texts
|
2017-05-16 16:30:33 +02:00 |
|
Rodney Figaro
|
645bf55797
|
13161 - rewrite comments in override payment module
|
2017-05-15 11:04:37 +02:00 |
|
Rodney Figaro
|
7857dd6278
|
13161 - add id_category_default in payment module to sort by brands in emails
|
2017-05-15 10:59:04 +02:00 |
|
Rodney Figaro
|
db09be33ce
|
13161 - fix bug in payment module
|
2017-05-15 10:55:24 +02:00 |
|
Rodney Figaro
|
621da01bd8
|
13161 - simplify paymentmodule override
|
2017-05-15 10:53:35 +02:00 |
|
Rodney Figaro
|
9aae6f7bbf
|
13161 - sort product by brands in email confirmation order
|
2017-05-15 10:41:55 +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
|
f46921981d
|
13161 - increase memory limit during logo/bkg upload
|
2017-05-12 17:09:53 +02:00 |
|
Rodney Figaro
|
2cf07ece99
|
13161 - add image upload checking and force resize
|
2017-05-12 16:59:17 +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
|
69c5338121
|
13161 - fix order confirmation cart summary
|
2017-05-12 16:24:07 +02:00 |
|
Rodney Figaro
|
6109c60f9f
|
13161 - fix unchecked "brands" variable in shopping cart tpl
|
2017-05-12 15:06:58 +02:00 |
|
Rodney Figaro
|
25868a2255
|
13161 - update history order details with products per brands, fix bugs, refactoring
|
2017-05-12 12:49:08 +02:00 |
|
Rodney Figaro
|
1289b0903d
|
13161 - change labels of images in admin category form
|
2017-05-12 11:33:30 +02:00 |
|
root
|
5b48817a65
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' of gitlab.antadis.net:dev-antadis/roykin into ticket/r13161-Fusion-Levest-Roykin
|
2017-05-12 09:08:53 +00:00 |
|
root
|
515d278d97
|
13161 - change background image front css
|
2017-05-12 09:08:15 +00:00 |
|
Rodney Figaro
|
4745a769f3
|
13161 - hide families tab in front menu
|
2017-05-12 10:42:28 +02:00 |
|
Rodney Figaro
|
b76115952b
|
13161 - fix logo/background thumbnail generation in admin category
|
2017-05-12 09:25:11 +02:00 |
|
Rodney Figaro
|
3163cc8461
|
13161 - fix menu bug (no brands) in search page
|
2017-05-11 18:42:41 +02:00 |
|
root
|
8ee820c22b
|
13161 - Integration
|
2017-05-11 16:34:43 +00:00 |
|
Rodney Figaro
|
38c4b60cc2
|
13161 - change cart product per brands sorting
|
2017-05-11 18:06:29 +02:00 |
|
Rodney Figaro
|
c641b3f04e
|
13161 - sort products per "brands" category in shopping list
|
2017-05-11 16:21:54 +02:00 |
|
Rodney Figaro
|
05a506cb26
|
13161 - generalize the menu building and redirections in categories
|
2017-05-11 12:55:53 +02:00 |
|
Rodney Figaro
|
7705eea62b
|
13161 - restore level 3 menu
|
2017-05-11 11:55:13 +02:00 |
|
Rodney Figaro
|
4b4c5f4e4a
|
13161 - add first version of logos and background in category
|
2017-05-10 18:41:57 +02:00 |
|