Marion Muszynski
f2273997dd
Merge branch 'ticket-13023-MultilangThumbCat' into develop
2017-04-18 12:48:57 +02:00
Marion Muszynski
90dd61b5bb
add multilang on category img thumbs
2017-04-18 12:48:42 +02:00
Marion Muszynski
cf81f171ca
Merge branch 'ticket-13015-modifAdminSale' into develop
2017-04-13 13:02:06 +02:00
Marion Muszynski
d72262dd99
add override employee
2017-04-13 13:01:51 +02:00
Marion Muszynski
35e33703b7
fix conflicts
2017-04-13 12:32:44 +02:00
Marion Muszynski
8f62586369
fix conflict
2017-04-11 12:08:19 +02:00
Marion Muszynski
89f72c7045
Merge branch 'ticket-12462-returnMR'
2017-04-06 16:24:22 +02:00
Marion Muszynski
6e1bbf4d95
Merge branch 'ticket-12452-SAVMessHistory' into develop
2017-04-06 16:10:42 +02:00
Marion Muszynski
2b861808e0
addition of conversation history in customer thread
2017-04-06 16:10:25 +02:00
Marion Muszynski
d847224f01
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-09 11:38:01 +01:00
Marion Muszynski
33cd9f3d08
continuation
2017-03-09 11:37:44 +01:00
Marion Muszynski
b38e5c87ab
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-09 10:54:11 +01:00
Marion Muszynski
f1e3151dac
fix ssl
2017-03-09 10:53:26 +01:00
Marion Muszynski
67d70b33e0
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-08 18:05:32 +01:00
Marion Muszynski
8051a5e9c2
fix redirect loop
2017-03-08 18:05:04 +01:00
Marion Muszynski
e554592f77
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-08 17:51:22 +01:00
Marion Muszynski
0658afedc6
other fixes
2017-03-08 17:50:41 +01:00
Marion Muszynski
fdd9dfc243
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-08 17:35:47 +01:00
Marion Muszynski
6a02d5ae5c
add getPageLinkSsl
2017-03-08 17:35:26 +01:00
Marion Muszynski
bbe29db5e9
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-08 17:28:15 +01:00
Marion Muszynski
ebcf6fe55b
fix useSSL
2017-03-08 17:27:37 +01:00
Marion Muszynski
833315393a
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-08 17:19:54 +01:00
Marion Muszynski
9581b90d6c
fix protocol
2017-03-08 17:19:26 +01:00
Marion Muszynski
17c6ac82b6
fix bugs
2017-03-08 16:11:36 +01:00
Marion Muszynski
2e6e1d23ec
start of changement to full https
2017-03-08 16:10:35 +01:00
Marion Muszynski
8bd907d1bd
Merge branch 'ticket-12591-MarketingModifications' into develop
2017-03-07 13:26:08 +01:00
Marion Muszynski
ee271d98c8
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
2017-03-07 13:25:46 +01:00
Marion Muszynski
208f2e2476
Merge branch 'ticket-12462-returnMR' into develop
2017-02-21 14:25:07 +01:00
Marion Muszynski
40596721a0
fix conflicts
2017-02-21 11:51:37 +01:00
Marion Muszynski
2837aea4a5
addition of picto for random product
2017-02-21 11:49:55 +01:00
Marion Muszynski
8a61a09988
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-02-15 11:39:15 +01:00
Marion Muszynski
0bc72ecb87
Merge branch 'ticket-10393'
2017-02-08 14:49:31 +01:00
Marion Muszynski
3b7bde22db
addition of mondial relay return process in adminOrder
2017-02-06 16:07:35 +01:00
Marion Muszynski
7f57941994
Merge branch 'ticket-12417-RedirectLogged' into develop
2017-02-01 12:24:58 +01:00
Marion Muszynski
842d90ba05
change redirect to home when customer is logged
2017-02-01 12:24:39 +01:00
Marion Muszynski
fce0de0f03
Merge branch 'ticket-12397-LinkCategoryWithDiscount' into develop
2017-01-30 15:08:27 +01:00
Marion Muszynski
25447fd61a
addition of discount category checking
2017-01-30 15:08:10 +01:00
Marion Muszynski
877fab90a7
fix conflicts
2017-01-27 13:09:02 +01:00
Marion Muszynski
14582e4e0f
change delay name of socol carriers when its delivered in Belgium
2017-01-27 10:45:48 +01:00
Marion Muszynski
8204486942
update cron and mail conf_order
2017-01-26 15:32:22 +01:00
Marion Muszynski
b31b1bd6f0
Merge branch 'ticket-12197-NewDiscountAdminOrder'
2017-01-19 10:10:22 +01:00
Marion Muszynski
5f40792fa8
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-01-12 14:33:17 +01:00
Marion Muszynski
c75ac311d8
fix paymentModule
2017-01-12 14:31:57 +01:00
Marion Muszynski
0347a73068
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-01-12 13:04:20 +01:00
Marion Muszynski
9b2f18c2ef
fix wsu laposte, addition in adminLogistics and ajax for MR
2017-01-12 13:03:48 +01:00
Marion Muszynski
2cf8ec1073
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-01-11 18:26:59 +01:00
Marion Muszynski
4716b247d9
fix
2017-01-11 18:26:36 +01:00
Marion Muszynski
4aca04400e
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-01-11 18:11:49 +01:00
Marion Muszynski
092a1b169b
fix
2017-01-11 18:11:29 +01:00
Marion Muszynski
39db1b8145
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-01-11 18:02:51 +01:00
Marion Muszynski
262cac694a
change message in mail order_conf
2017-01-11 18:02:31 +01:00
Marion Muszynski
654908b9bf
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-01-11 16:58:28 +01:00
Marion Muszynski
80e0bffe4f
fix for dev
2017-01-11 16:58:05 +01:00
Marion Muszynski
682d0b48f8
fix conflicts
2017-01-11 15:55:31 +01:00
Marion Muszynski
c4cbe24bb5
addition of crons and admin_order tpl for Mondial Relay
2017-01-11 15:53:24 +01:00
Marion Muszynski
5192561bac
update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay
2017-01-11 15:33:44 +01:00
Marion Muszynski
6e48dd3722
Merge branch 'ticket-10393' into develop
2017-01-10 11:22:30 +01:00
Marion Muszynski
75d2269f9a
fix conflict
2017-01-09 15:04:04 +01:00
Marion Muszynski
22b9815c1c
changement ant_configuration to store carrier conf in db Configuration
2017-01-09 15:02:14 +01:00
Marion Muszynski
1146df59c8
Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop
2017-01-09 12:04:13 +01:00
Marion Muszynski
a29a54f41e
addition of new discount of 5 for missing product
2017-01-09 12:03:58 +01:00
Marion Muszynski
f62b3b6993
Merge branch 'ticket-12199-PopupAddToCart' into develop
2017-01-09 10:44:30 +01:00
Marion Muszynski
228798b4e1
upgrade limit max char for order messages
2017-01-09 10:16:10 +01:00
Marion Muszynski
46e655751d
fix value for prod
2017-01-06 16:47:55 +01:00
Marion Muszynski
9ca81ea508
Merge branch 'ticket-11056-addRestriction' into develop
2017-01-06 16:33:23 +01:00
Marion Muszynski
cd4aa777d5
value for dev
2017-01-06 16:32:55 +01:00
Marion Muszynski
ebcd9d6f39
fix conflict and attribute value for dev
2017-01-06 16:27:25 +01:00
Marion Muszynski
6cc03d0287
restriction with carrier priority
2017-01-06 16:25:08 +01:00
Marion Muszynski
d148fffa70
Merge branch 'ticket-11201-SlowCategoryCreation'
2016-12-26 11:43:23 +01:00
Marion Muszynski
4f3b7c2b15
Merge branch 'ticket-12122-ModifNewStatus' into develop
2016-12-23 14:00:01 +01:00
Marion Muszynski
a965103db4
continuing changement
2016-12-23 13:04:16 +01:00
Marion Muszynski
d329b24250
fix trad 2
2016-12-21 12:53:59 +01:00
Marion Muszynski
9a9d363b87
Merge branch 'ticket-11208-FactureCadeau' into develop
2016-12-21 12:24:48 +01:00
Marion Muszynski
2b30de1cce
changement, deletion of pdf overrided
2016-12-21 12:24:31 +01:00
Marion Muszynski
79a1d1ec71
Merge branch 'ticket-11201-SlowCategoryCreation' into develop
2016-12-15 17:12:09 +01:00
Marion Muszynski
b3b9d7313f
Merge branch 'ticket-12052-PreventDelivery' into develop
2016-12-15 12:02:48 +01:00
Marion Muszynski
a13396baa8
restriction for delivery to ceuta and melina
2016-12-15 12:02:32 +01:00
Marion Muszynski
9500f86e9d
changement
2016-12-15 11:47:40 +01:00
Marion Muszynski
3756a2d4b7
modification regenerateTree to limit to active categories
2016-12-14 18:12:08 +01:00
Marion Muszynski
715db47da4
add manually generation of ntree
2016-12-14 10:28:03 +01:00
Marion Muszynski
f4e2256c65
fix conflicts
2016-12-08 15:46:19 +01:00
Marion Muszynski
a4752145fa
fix conflicts
2016-12-07 14:36:59 +01:00
Marion Muszynski
24a06175ba
Merge branch 'ticket-11935-SuiviConversation' into develop
2016-12-02 16:00:29 +01:00
Marion Muszynski
192cd79a6b
continuing packs
2016-12-02 15:34:57 +01:00
Marion Muszynski
6964d4fb69
fix
2016-12-02 12:06:52 +01:00
Marion Muszynski
8c087ed509
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-28 11:02:22 +01:00
Marion Muszynski
f773e845aa
addition of pack id in cart quantities to check pack availability
2016-11-28 11:01:38 +01:00
Marion Muszynski
73f0233a89
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-23 13:05:14 +01:00
Marion Muszynski
bed6cbcd76
fix missing var
2016-11-23 13:04:37 +01:00
Marion Muszynski
6f2b7f8732
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-23 12:57:51 +01:00
Marion Muszynski
5578bac1ae
addition for packs management
2016-11-23 12:57:33 +01:00
Marion Muszynski
ec7d73696b
Merge branch 'ticket-10657-PhileaMulti'
2016-11-21 15:34:34 +01:00
Marion Muszynski
1d6e27dd40
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-21 15:27:04 +01:00
Marion Muszynski
2dceab8015
fix for classic sale
2016-11-21 15:26:46 +01:00
Marion Muszynski
a224bfd940
Merge branch 'ticket-10657-PhileaMulti'
2016-11-21 13:01:13 +01:00
Marion Muszynski
63fcc839e3
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-21 12:56:37 +01:00
Marion Muszynski
c2b5077efe
fix
2016-11-21 12:56:12 +01:00
Marion Muszynski
894de500bc
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-21 12:45:36 +01:00
Marion Muszynski
66bdae1aef
prevent combination of sale exp classic and sale exp before noel
2016-11-21 12:45:20 +01:00
Marion Muszynski
8ec2a6ba21
Merge branch 'ticket-10657-PhileaMulti'
2016-11-21 10:18:38 +01:00
Marion Muszynski
a10aceb571
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-18 17:27:12 +01:00
Marion Muszynski
f5a841a2f1
adjust for exp Noel
2016-11-18 17:26:53 +01:00
Marion Muszynski
218aac655a
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-18 12:24:54 +01:00
Marion Muszynski
d9fbfc438a
small fix
2016-11-18 12:24:37 +01:00
Marion Muszynski
3f7d969371
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-18 12:09:17 +01:00
Marion Muszynski
4ac4753900
begining of updatings
2016-11-18 09:50:04 +01:00
Marion Muszynski
fce88331a3
fix conflict
2016-11-16 15:55:07 +01:00
Marion Muszynski
31ea35e160
selection only a specific category_family
2016-11-16 15:50:39 +01:00
Marion Muszynski
b915ed8649
Merge branch 'ticket-AideContact-SAV' into develop
2016-11-02 17:04:16 +01:00
Marion Muszynski
5b95689b06
small updating
2016-11-02 17:03:58 +01:00
Marion Muszynski
699ceebbf3
Merge branch 'ticket-AssociateProducts' into develop
2016-10-14 16:31:24 +02:00
Marion Muszynski
a80ce2855a
fix when sale is in multi families
2016-10-14 16:31:09 +02:00
Marion Muszynski
31bea61242
fix conflict
2016-10-06 15:29:09 +02:00
Marion Muszynski
6e515c5207
Merge branch 'ticket-AssociateProducts' into develop
2016-10-05 17:51:08 +02:00
Marion Muszynski
6a415ac50f
modif css
2016-10-05 17:50:45 +02:00
Marion Muszynski
e6fdac5dbe
Merge branch 'ticket-8048'
2016-09-28 16:57:04 +02:00
Marion Muszynski
62c434fd57
Merge branch 'ticket-8048' into develop
2016-09-23 14:56:53 +02:00
Rodney Figaro
155bd6a231
fix when no accessories and no family product
2016-09-23 14:51:52 +02:00
Rodney Figaro
c9ad2799d0
move the similar products block into one tab in product details
...
- fix the number of products displayed in the 'best sales for family' case
- replace the slider by an adapted block with visuals differents from the best sales slider.
- adapt the show cart javascript in order to get the correct height of product blocks on which
the user click
- fix selection between accessories and best sales for family in hooks
- add a hook in order to display the correct label in the new tab
- restore olds methods for best sales product. Routines related to the best sales family products have their own methods.
- fix cache generation
2016-09-22 15:14:39 +02:00
Marion Muszynski
73a3127d3e
Merge branch 'ticket-eanUpgrade' into develop
2016-09-22 11:13:52 +02:00
Marion Muszynski
7a8d2c9339
move of comment block
2016-09-22 11:12:49 +02:00
Marion Muszynski
c049980a9a
up lenght reference of product
2016-09-22 11:02:55 +02:00
Marion Muszynski
385af21769
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:47:32 +02:00
Marion Muszynski
430cabc449
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 14:49:30 +02:00
Marion Muszynski
58d2b92b0c
continuing braderie upgrade
2016-09-20 14:49:02 +02:00
Marion Muszynski
ed769a1749
start of ticket GA Enhanced Ecommerce
2016-09-19 18:47:37 +02:00
Marion Muszynski
5aac7f617b
Merge branch 'ticket-8048' into develop
2016-09-19 12:42:21 +02:00
Marion Muszynski
cf18d95f8b
moving of sale export block to privatesale logisitique
2016-09-14 17:42:08 +02:00
Marion Muszynski
2e7ff69817
addition of date to find the good ps in bulkupdate export part
2016-09-14 17:00:01 +02:00
Marion Muszynski
cf3b0cca11
addition of category thumb checking
2016-09-14 11:03:36 +02:00
Rodney Figaro
5baa5eaf9a
fix : get best sale of the same sale family with label in front
2016-09-13 10:48:36 +02:00
Rodney Figaro
ebb136206a
remove unused code
2016-09-13 09:34:18 +02:00
Rodney Figaro
bdd6aadc71
show best sales of same sale family rather than the same category
2016-09-12 18:08:28 +02:00
Rodney Figaro
48daa71f67
fix db fields requested by one method in productsale, fix arguments in methods in module
2016-09-12 12:12:05 +02:00
Rodney Figaro
9ecf2491c6
add module 'privatesales_similarproduct'
...
In product detail page :
- show slider with product associated accessories if any, above the best selling products slider
- show product's family best selling instead of the accessories, if any
- show no slider if no accessories nor family best selling present
Cache slider templates for :
- associated accessories for each product for every language, if any
- family best selling for each family of the product for every language, if any
Fixes in javascript :
- missing globals variables in module expresscart would the express cart fail when out of stock
- change the express cart displaying when clicking on the cart icon in any footer sliders.
Css :
duplicate all css styles 'best-sellers_block_product' in 'privatesales_similarproduct' so that the latter slider can be adapted if required.
2016-09-08 13:04:14 +02:00
Marion Muszynski
c63eb836ad
table addition to load current order state
2016-09-08 11:52:44 +02:00
Marion Muszynski
2d10e1b167
Merge branch 'ticket-9260'
2016-09-05 16:52:19 +02:00
Marion Muszynski
50e0bc4c79
modification to find the right category thumb in productController
2016-09-05 16:22:28 +02:00
Marion Muszynski
17eda01760
modif for children cat
2016-09-05 11:57:43 +02:00
Marion Muszynski
13e85738e6
Merge branch 'ticket-9260'
2016-09-05 10:37:24 +02:00
Marion Muszynski
3d685e10b4
fix addition
2016-09-05 10:24:21 +02:00
Marion Muszynski
0c7aefe613
fix to get sub cat thumb
2016-08-31 12:41:07 +02:00
Marion Muszynski
11df31d8bd
Merge branch 'ticket_9890'
2016-08-31 11:56:22 +02:00
Marion Muszynski
ff0d7651bf
fix total product attribute quantities
2016-08-31 11:55:14 +02:00
Marion Muszynski
bb5ff6ba97
fix conflicts
2016-08-31 11:04:16 +02:00
Rodney Figaro
4808607e56
add purchase guide module - backoffice only
2016-08-30 18:10:44 +02:00
Marion Muszynski
0dde6b5611
fix for old sales
2016-08-30 13:55:47 +02:00
Marion Muszynski
a96b0018c0
upload vp miniature in adminCategory
2016-08-30 13:47:42 +02:00
Marion Muszynski
35deb50531
Merge branch 'ticket-9728'
2016-08-25 13:05:58 +02:00
Rodney Figaro
33c5572c08
apply the same confirmation order page to all type of paypal paiements
2016-08-24 17:24:41 +02:00
