antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,928 Commits 124 Branches 0 Tags 108 MiB
master
Commit Graph

317 Commits

Author SHA1 Message Date
Marion Muszynski
0658afedc6 other fixes 2017-03-08 17:50:41 +01:00
Marion Muszynski
6a02d5ae5c add getPageLinkSsl 2017-03-08 17:35:26 +01:00
Marion Muszynski
ebcf6fe55b fix useSSL 2017-03-08 17:27:37 +01:00
Marion Muszynski
9581b90d6c fix protocol 2017-03-08 17:19:26 +01:00
Marion Muszynski
2e6e1d23ec start of changement to full https 2017-03-08 16:10:35 +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
2837aea4a5 addition of picto for random product 2017-02-21 11:49:55 +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
842d90ba05 change redirect to home when customer is logged 2017-02-01 12:24:39 +01:00
Marion Muszynski
25447fd61a addition of discount category checking 2017-01-30 15:08:10 +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
c75ac311d8 fix paymentModule 2017-01-12 14:31:57 +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
4716b247d9 fix 2017-01-11 18:26:36 +01:00
Marion Muszynski
092a1b169b fix 2017-01-11 18:11:29 +01:00
Marion Muszynski
262cac694a change message in mail order_conf 2017-01-11 18:02:31 +01:00
Marion Muszynski
80e0bffe4f fix for dev 2017-01-11 16:58:05 +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
22b9815c1c changement ant_configuration to store carrier conf in db Configuration 2017-01-09 15:02:14 +01:00
Marion Muszynski
a29a54f41e addition of new discount of 5 for missing product 2017-01-09 12:03:58 +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
cd4aa777d5 value for dev 2017-01-06 16:32:55 +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
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
2b30de1cce changement, deletion of pdf overrided 2016-12-21 12:24:31 +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
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
f773e845aa addition of pack id in cart quantities to check pack availability 2016-11-28 11:01:38 +01:00
Marion Muszynski
bed6cbcd76 fix missing var 2016-11-23 13:04:37 +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
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
c2b5077efe fix 2016-11-21 12:56:12 +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
f5a841a2f1 adjust for exp Noel 2016-11-18 17:26:53 +01:00
Marion Muszynski
d9fbfc438a small fix 2016-11-18 12:24:37 +01:00
Marion Muszynski
4ac4753900 begining of updatings 2016-11-18 09:50:04 +01:00
Marion Muszynski
31ea35e160 selection only a specific category_family 2016-11-16 15:50:39 +01:00
Marion Muszynski
5b95689b06 small updating 2016-11-02 17:03:58 +01:00
Marion Muszynski
31bea61242 fix conflict 2016-10-06 15:29:09 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +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
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
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
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
Rodney Figaro
69f6d0dcd0 add column ecotax if any in the PDF invoices 2016-08-23 17:37:35 +02:00
Marion Muszynski
2ab551f44a fix conflict 2016-07-27 16:31:59 +02:00
Marion Muszynski
8ca7d2b05b standardization date estimation 2016-07-25 12:48:21 +02:00
Marion Muszynski
e69073572e modif date 2016-07-25 12:19:36 +02:00
Marion Muszynski
f4f144057d modif date calcul method to include we and check if the last day is a business day 2016-07-25 12:05:57 +02:00
Marion Muszynski
a6ec43bb68 showing estimation delivery date in cart 2016-07-13 17:40:13 +02:00
Marion Muszynski
02af220b58 showing delivery delay estimation on product tpl 2016-07-13 16:37:00 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
20896d3bbf adding popup error for mobile 2016-06-29 09:59:03 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Srv Bebeboutik
e7e7f8381c push prod modif carrier 2016-06-20 10:42:30 +02:00
Dylan Travers
1e674c4adf Add 'X item(s) in stock' from ticket n°9890 2016-06-14 10:40:57 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
7ad38029da adding filter 2016-06-06 17:27:09 +02:00
Marion Muszynski
b332800b77 new fields in product db 2016-06-06 14:35:07 +02:00
Srv Bebeboutik
7085c1b80a update from prod 2016-06-06 12:35:00 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
5f932e9bcd opti attribute group deletion 2016-06-03 13:06:03 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
332ac320fb modif for prod 2016-06-02 12:19:24 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
3e0ad8592d update link 2016-06-01 11:23:37 +02:00
Marion Muszynski
96ca86fe85 modif error message 2016-06-01 10:57:31 +02:00
Marion Muszynski
d63a2d7d5a addind field to config if delivery of sale is enabled only in fr 2016-05-30 15:42:20 +02:00
Marion Muszynski
eb441d8edf adding autocomplete postcode 2016-05-19 13:13:47 +02:00
Marion Muszynski
03c743985c modif for prod 2016-05-18 11:19:27 +02:00
Marion Muszynski
13b20adb20 modif validate field OrderDetail 2016-05-18 11:17:41 +02:00
Marion Muszynski
97ef053f1f update for prod 2016-05-18 10:33:23 +02:00
Marion Muszynski
796b0af17c modif for update socol address in BO order 2016-05-18 10:30:17 +02:00
Marion Muszynski
adbe272c7b modif for prod 2016-05-17 16:05:20 +02:00
Marion Muszynski
b7f247729f modif tpl carrier et css 2016-05-17 15:56:27 +02:00
Marion Muszynski
881878e994 modif fdp fix in cart 2016-05-17 14:51:12 +02:00
Marion Muszynski
d571de9d0a modif for prod 2016-05-17 14:32:35 +02:00
Marion Muszynski
30410a5fc8 supp des fdp fix pour vente consommable 2016-05-17 14:31:41 +02:00
Marion Muszynski
dbb4656f42 adapte carrier for prod 2016-05-13 14:36:51 +02:00
Marion Muszynski
acc8ded407 adapte carrier for dev 2016-05-13 14:19:35 +02:00
Marion Muszynski
7e7feb5a52 ajust css and opti restrict addresses 2016-05-13 13:31:50 +02:00
Srv Bebeboutik
5a7c3a0241 modif cart 2016-05-13 10:37:05 +02:00
Srv Bebeboutik
3a4f5414d8 fix conflict 2016-05-12 12:12:42 +02:00
Srv Bebeboutik
34b34929ef push la modif de cart 2016-05-12 12:10:50 +02:00
Marion Muszynski
ebdd485182 modif id carrier in cart 2016-05-12 10:18:15 +02:00
Marion Muszynski
f0d183580a modif cart 2016-05-09 18:02:20 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
ef33e2cbc7 Merge branch 'ticket-newExtracts' 2016-04-20 16:05:20 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
c63769824e add 2 new extracts for deb 2016-04-20 11:37:50 +02:00
Marion Muszynski
d4722a7e81 order in search product 2016-04-14 13:06:06 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00
Marion Muszynski
1d26459616 update landing page for connect button 2016-04-08 15:31:40 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Marion Muszynski
91efe4469e fix conflict adminProduct 2016-04-06 14:46:47 +02:00
Marion Muszynski
f6f481e09a Merge branch 'ticket-9759' into develop 2016-03-29 17:20:55 +02:00
Marion Muszynski
ba8fa44d2f fix hook 2016-03-29 17:20:28 +02:00
Marion Muszynski
9a5cf505da Merge branch 'ticket-9759' into develop 2016-03-29 17:02:21 +02:00
Marion Muszynski
b763543244 adding ant_alert module 2016-03-29 17:01:26 +02:00
Marion Muszynski
26701eeba5 fix conflict 2016-03-23 12:02:14 +01:00
Marion Muszynski
67264249a5 fix quantity and product with attribute 2016-03-23 11:49:34 +01:00
Alexandre Simonet
9240003ba5 Fix 2016-03-21 10:07:35 +01:00
Marion Muszynski
9a3da1848d Merge branch 'ticket-9642' into develop 2016-03-18 15:57:48 +01:00
Marion Muszynski
6feaf9ff28 test carrier cost 2016-03-18 15:57:22 +01:00
Marion Muszynski
3cca940e40 Merge branch 'ticket-9642' into develop 2016-03-17 12:32:16 +01:00
Marion Muszynski
879418dea1 add check carrier in ParentOrderController 2016-03-17 12:31:42 +01:00
Marion Muszynski
3e64a14e8b Merge branch 'ticket-9642' into develop 2016-03-16 15:25:16 +01:00
Marion Muszynski
e152929f34 trim email update 2016-03-11 01:00:52 +01:00
Marion Muszynski
a9b942ecf6 trim email 2016-03-10 18:19:41 +01:00
Thibault UBUNTU
fad3dbe3c5 fix merge master 2016-03-10 10:40:06 +01:00
Srv Bebeboutik
1426efaff2 change gitignore + class product 2016-03-09 16:33:05 +01:00
Thibault UBUNTU
5ee28563f1 block canaries delivery 2016-03-07 15:58:26 +01:00
Marion Muszynski
5bb7d037a9 fix conflit FrontController 2016-02-24 17:39:59 +01:00
Marion Muszynski
bd3c6cb40c merge frontController/config.inc 2016-02-24 17:23:16 +01:00
Marion Muszynski
ce7462c19e labelgenerate 2016-02-24 17:12:23 +01:00
Srv Bebeboutik
fc61e2ed3a fix truc de merdeeeeeeeeeeee 2016-02-24 16:11:24 +01:00
Thibault UBUNTU
4d81184816 fix conflict 2016-02-24 16:03:29 +01:00
Thibault UBUNTU
d39e27d271 fix conflit 2016-02-24 16:02:43 +01:00
Alexandre Simonet
f778675389 sav 2016-02-23 17:33:08 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00
Srv Bebeboutik
bfcb4e9aa6 add override class cart to display flag 2016-01-27 16:00:05 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00