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
|
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
|
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 |
|
Rodney Figaro
|
8e7e4f4847
|
13161 - change id of roykin category
|
2017-05-10 14:37:48 +02:00 |
|
Rodney Figaro
|
171fc052e8
|
Revert "13161 - define only default sub categories of brands and home"
This reverts commit 9fb708677f.
|
2017-05-10 14:24:53 +02:00 |
|
Rodney Figaro
|
9fb708677f
|
13161 - define only default sub categories of brands and home
|
2017-05-10 14:17:55 +02:00 |
|
Rodney Figaro
|
bc90864f26
|
13161 - fix message alert box integration in search page
|
2017-05-10 12:51:21 +02:00 |
|
Rodney Figaro
|
79c1744cd3
|
13161 - change menus relationship to categories, change categories constants
|
2017-05-10 12:40:14 +02:00 |
|
Rodney Figaro
|
4a60da7510
|
13161 - Category::getCategoriesTree returns array() by default
|
2017-05-10 10:34:43 +02:00 |
|
Rodney Figaro
|
595a52bee7
|
13161 - replace CATEGORY_COLLECTION_ALL in all overrided controllers except CategoryController by a calling of a Category default method
|
2017-05-10 10:15:22 +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
|
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 |
|
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 |
|