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

984 Commits

Author SHA1 Message Date
Marion Muszynski
e2a4385a5e fix change address socol for DOM 2016-10-19 18:31:19 +02:00
Marion Muszynski
c7579d79aa Merge branch 'ticket-GAnalytics-mobile' into develop 2016-10-19 16:23:35 +02:00
Marion Muszynski
ab39335846 integration of enhanced ecommerce on mobile version 2016-10-19 16:23:01 +02:00
Marion Muszynski
607d4d0628 Merge branch 'fix-paypal' into develop 2016-10-18 13:11:54 +02:00
Marion Muszynski
3b2eec3adc fix 2016-10-18 13:11:32 +02:00
Marion Muszynski
d9c8a37f64 fix conflict 2016-10-18 13:00:30 +02:00
Marion Muszynski
55129786ec open paypal account 2016-10-18 12:59:37 +02:00
Marion Muszynski
1f5d683f4b fix conflict 2016-10-18 12:58:26 +02:00
Marion Muszynski
9aac4ea22a comment address creation and recuperation address info after doExpressCheckout 2016-10-18 12:54:53 +02:00
Marion Muszynski
b5916c5a74 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 12:12:27 +02:00
Marion Muszynski
84f2643e53 continuation sav 2016-10-18 12:12:06 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
6e0cfd7635 modif 2016-10-17 17:29:37 +02:00
Marion Muszynski
27a62959a6 start refund sav page 2016-10-14 18:30:05 +02: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
f1e58c8551 Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-14 15:10:29 +02:00
Marion Muszynski
96d5e30520 checking only fr sale 2016-10-14 15:10:11 +02:00
Marion Muszynski
0989a6633a Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-14 14:00:04 +02:00
Marion Muszynski
6b713f470c fix 2016-10-14 13:59:51 +02:00
Marion Muszynski
a42ec3e70b Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-14 13:55:38 +02:00
Marion Muszynski
75972081eb addition domtom and canarie checking 2016-10-14 13:55:21 +02:00
Marion Muszynski
bb95ffcaa1 Merge branch 'ticket-11056' into develop 2016-10-14 13:11:15 +02:00
Marion Muszynski
9edcc64a82 modification of delivery mode selection 2016-10-14 13:10:56 +02:00
Marion Muszynski
72a789159a Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-13 15:53:46 +02:00
Marion Muszynski
e8bb0d7eac css addition and fixes 2016-10-13 15:53:23 +02:00
Marion Muszynski
745156fe1c Merge branch 'ticket-updateStat' into develop 2016-10-12 18:18:42 +02:00
Marion Muszynski
cd7a64735a fix 2016-10-12 18:18:21 +02:00
Marion Muszynski
14a7368a90 fix conflict 2016-10-12 18:15:01 +02:00
Marion Muszynski
8f6decb643 addition of id sale in export 2016-10-12 18:13:45 +02:00
Marion Muszynski
bdb50a3c16 Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-12 16:45:44 +02:00
Marion Muszynski
178587ba7b continuing address modification 2016-10-12 16:45:24 +02:00
Marion Muszynski
385561fc7c fix conflcit 2016-10-12 12:42:41 +02:00
Marion Muszynski
7c0839eea5 addition of module to change delivery address 2016-10-12 12:40:33 +02:00
Marion Muszynski
855d8ba529 Merge branch 'ticket-payboxAgreement' 2016-10-11 14:49:49 +02:00
Marion Muszynski
c0b23b26c3 fix number card 2016-10-11 14:49:32 +02:00
Marion Muszynski
b33b709bed Merge branch 'ticket-payboxAgreement' 2016-10-11 11:56:05 +02:00
Marion Muszynski
8729c7a6aa fix conflict 2016-10-11 11:49:33 +02:00
Marion Muszynski
2a524a6262 openning save card to everyone 2016-10-11 11:48:25 +02:00
Marion Muszynski
b50bcf4848 fix conflict 2016-10-07 15:05:20 +02:00
Marion Muszynski
46cae17534 fix conflict 2016-10-06 16:00:32 +02:00
Marion Muszynski
71a4bcdd52 fix name of payment type 2016-10-06 15:58:50 +02:00
Marion Muszynski
31bea61242 fix conflict 2016-10-06 15:29:09 +02:00
Marion Muszynski
b2df0d740f Merge branch 'ticket-payboxAgreement' 2016-10-06 15:15:10 +02:00
Marion Muszynski
bd80e2c3fa Merge branch 'ticket-payboxAgreement' into develop 2016-10-06 14:53:53 +02:00
Marion Muszynski
9a20001d73 small fix 2016-10-06 14:53:29 +02:00
Marion Muszynski
3b9e7d45e9 Merge branch 'ticket-payboxAgreement' into develop 2016-10-06 14:47:16 +02:00
Marion Muszynski
cfc9e5cf3d adjusting refabonne to allow multi saved cards for the same account 2016-10-06 14:46:50 +02:00
Marion Muszynski
79b0ca62cd fix conflict 2016-10-06 11:56:59 +02:00
Marion Muszynski
4f446ca296 continuation of ant_support and sav 2016-10-06 11:55:13 +02:00
Marion Muszynski
283b924690 Merge branch 'ticket-AssociateProducts' into develop 2016-10-05 12:29:34 +02:00
Marion Muszynski
cb5cd4f1b4 adjust lenght of slider 2016-10-05 12:29:10 +02:00
Marion Muszynski
541a0ed663 fix conflict 2016-10-05 11:27:50 +02:00
Marion Muszynski
6c927d2266 addition of id category of sale in sale management 2016-10-05 11:25:43 +02:00
Marion Muszynski
13385c964d Merge branch 'ticket-philea' 2016-09-30 13:08:22 +02:00
Marion Muszynski
c0110a6618 modif css and fix alert missing quantity in orders 2016-09-30 13:06:24 +02:00
Marion Muszynski
8369aa187f Merge branch 'ticket-philea' 2016-09-29 18:08:48 +02:00
Marion Muszynski
d9fd7547d1 addition of preparation report 2016-09-29 18:08:23 +02:00
Marion Muszynski
4b7d6ac5ae fix print single attribute 2016-09-29 16:11:06 +02:00
Marion Muszynski
9e8a975d2f test for code 128 print 2016-09-29 15:56:17 +02:00
Marion Muszynski
14b6ee9e33 fix 2016-09-29 14:24:57 +02:00
Marion Muszynski
b47cf63cdd fix continuing 2016-09-29 10:32:10 +02:00
Marion Muszynski
e6f254dbcd fix to print ean whatever if length is 13 2016-09-29 10:17:12 +02:00
Marion Muszynski
5b3ac86cc5 Merge branch 'ticket-philea' 2016-09-28 18:11:43 +02:00
Marion Muszynski
4acbb1dcf6 fix recept_expe 2016-09-28 18:11:07 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +02:00
Marion Muszynski
b36c40446d addition of CRE and CRP management 2016-09-28 16:56:19 +02:00
Marion Muszynski
9cdc7edb8a Merge branch 'ticket-8048' into develop 2016-09-28 15:05:33 +02:00
Marion Muszynski
e7d82a7a30 fix js slider 2016-09-28 15:05:05 +02:00
Marion Muszynski
5355871476 Merge branch 'ticket-8048' into develop 2016-09-28 14:06:59 +02:00
Marion Muszynski
09b85f428f Merge branch 'ticket-payboxAgreement' 2016-09-28 13:03:12 +02:00
Marion Muszynski
7fff52b3b8 fix utf8 2016-09-28 13:02:55 +02:00
Rodney Figaro
da5a017c06 add scrolling/slide when products have more than 3 accessories 2016-09-28 12:44:25 +02:00
Marion Muszynski
2aad574498 Merge branch 'ticket-payboxAgreement' 2016-09-28 10:49:44 +02:00
Marion Muszynski
a96bc923d1 restrict mail sending to our ip 2016-09-28 10:49:22 +02:00
Marion Muszynski
16e16d6596 update CRE 2016-09-28 10:41:39 +02:00
Marion Muszynski
8ff008b8bf Merge branch 'ticket-payboxAgreement' 2016-09-27 12:07:51 +02:00
Marion Muszynski
f4ecfd644b adjusting response data for paybox payment information 2016-09-27 12:07:24 +02:00
Marion Muszynski
7b294b493c Merge branch 'ticket-payboxAgreement' 2016-09-27 11:37:56 +02:00
Marion Muszynski
829137c244 small fix 2016-09-27 11:37:17 +02:00
Marion Muszynski
7018bd81eb save refabonne 2016-09-27 11:36:41 +02:00
Marion Muszynski
2f21284be4 fix conflict 2016-09-27 10:34:47 +02:00
Marion Muszynski
6f89c44d2c prepare tests prod 2016-09-27 10:28:39 +02:00
Marion Muszynski
35700db205 Merge branch 'ticket-payboxAgreement' into develop 2016-09-26 17:51:35 +02:00
Marion Muszynski
0c5950b71d addition of a teston group before open save cb to every customer 2016-09-26 17:51:14 +02:00
Marion Muszynski
6047e4607c Merge branch 'ticket-payboxAgreement' into develop 2016-09-26 17:23:44 +02:00
Marion Muszynski
2d855a0071 remove tests for prod 2016-09-26 17:23:26 +02:00
Marion Muszynski
b9155ff9cb Merge branch 'ticket-payboxAgreement' into develop 2016-09-26 15:52:57 +02:00
Marion Muszynski
edc56267ca test on dev env 2016-09-26 15:52:37 +02:00
Marion Muszynski
0e61522150 change in soflexibility module to prevent xss 2016-09-26 12:24:01 +02:00
Marion Muszynski
a87bb60fc9 Merge branch 'ticket-payboxAgreement' into develop 2016-09-26 11:47:05 +02:00
Marion Muszynski
3615683240 enable link for prod 2016-09-26 11:46:37 +02:00
Marion Muszynski
2b86a3155c Merge branch 'ticket-8048' into develop 2016-09-23 18:05:17 +02:00
Marion Muszynski
205c04d522 fix and translation 2016-09-23 18:04:55 +02:00
Marion Muszynski
eb1a6f66d2 Merge branch 'ticket-8048' into develop 2016-09-23 17:54:17 +02:00
Marion Muszynski
8509789d5e link to product page in other window" 2016-09-23 17:53:49 +02:00
Marion Muszynski
5edc9724a3 Merge branch 'ticket-10805' into develop 2016-09-23 17:00:11 +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
Marion Muszynski
16ba72aa98 Merge branch 'ticket-eanUpgrade' 2016-09-23 13:31:00 +02:00
Marion Muszynski
125842b6f4 correction sentence 2016-09-23 13:30:38 +02:00
Marion Muszynski
47db67e6b5 Merge branch 'ticket-printProductEan' 2016-09-23 13:21:06 +02:00
Marion Muszynski
638bca8e04 Merge branch 'ticket-printProductEan' into develop 2016-09-23 13:17:04 +02:00
Marion Muszynski
0141a4e3ac fix url redirect 2016-09-23 13:16:44 +02:00
Marion Muszynski
e78e5098e3 Merge branch 'ticket-printProductEan' into develop 2016-09-23 13:09:56 +02:00
Marion Muszynski
41c2d81f39 addition of specific attribute ean printing 2016-09-23 13:09:34 +02:00
Marion Muszynski
c508f407b0 change input to a tag 2016-09-23 11:27:32 +02:00
Marion Muszynski
32301b7dd3 fix open window on click enter 2016-09-23 11:01:28 +02:00
Marion Muszynski
06e84c95da Merge branch 'ticket-eanUpgrade' 2016-09-22 17:17:54 +02:00
Marion Muszynski
808a5a797b Merge branch 'ticket-GAnalytics' into develop 2016-09-22 16:50:02 +02:00
Marion Muszynski
4799e10e6a changement transaction sending 2016-09-22 16:49:39 +02:00
Marion Muszynski
6349f63424 Merge branch 'ticket-eanUpgrade' into develop 2016-09-22 16:21:49 +02:00
Marion Muszynski
6af23598eb modif css 2016-09-22 16:21:32 +02:00
Marion Muszynski
432b96df7f Merge branch 'ticket-eanUpgrade' into develop 2016-09-22 16:14:07 +02:00
Marion Muszynski
b19cae2d4a change emplacement of fields 2016-09-22 16:13:45 +02:00
Marion Muszynski
308d79108b manage ec choice 2016-09-22 15:52:17 +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
1a3ce467c5 Merge branch 'ticket-printProductEan' into develop 2016-09-22 13:41:39 +02:00
Marion Muszynski
1ee43aad25 generation and print ean via admin product 2016-09-22 13:40:56 +02:00
Marion Muszynski
6373ce6e24 Merge branch 'ticket-eanUpgrade' 2016-09-22 10:42:26 +02:00
Marion Muszynski
b26fefd0f3 fix conflict 2016-09-21 16:24:32 +02:00
Marion Muszynski
2cde4025ac add loader for paybox direct payment 2016-09-21 16:21:32 +02:00
Marion Muszynski
338da7eb3f Merge branch 'ticket-GAnalytics' into develop 2016-09-21 16:09:14 +02:00
Marion Muszynski
3b855c7ad9 ec continuation, addition of addToCart event 2016-09-21 16:08:54 +02:00
Marion Muszynski
be48ec27d5 fix last_qties for categoryscroll ajax 2016-09-21 14:45:37 +02:00
Marion Muszynski
8df4bed44a continuation 2016-09-21 14:29:34 +02:00
Marion Muszynski
4230758422 add refund and cancel permission to profile 14 braderie 2016-09-21 10:50:36 +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
c6d74f9f1c Merge branch 'ticket-eanUpgrade' into develop 2016-09-20 11:03:15 +02:00
Marion Muszynski
ffe2e24a7a reset quantity value in braderie after product was added 2016-09-20 11:02:50 +02:00
Marion Muszynski
61b198a9c1 Merge branch 'ticket-eanUpgrade' into develop 2016-09-19 18:07:21 +02:00
Marion Muszynski
96ba6fbaca second fix 2016-09-19 18:07:02 +02:00
Marion Muszynski
b69bd11d6b fix issue vi 2016-09-19 18:03:07 +02:00
Marion Muszynski
cd540ac533 fix attribute image 2016-09-19 18:01:20 +02:00
Marion Muszynski
443b054b7e Merge branch 'ticket-eanUpgrade' into develop 2016-09-19 17:50:32 +02:00
Marion Muszynski
81769c64e7 addition of product image in braderie 2016-09-19 17:50:14 +02:00
Marion Muszynski
0e4e134544 Merge branch 'ticket-philea' 2016-09-19 15:40:17 +02:00
Marion Muszynski
fa825f9cc7 modif css 2016-09-19 15:39:50 +02:00
Marion Muszynski
588b23161d Merge branch 'ticket-philea' 2016-09-19 15:34:37 +02:00
Marion Muszynski
415b4b0999 Merge branch 'ticket-philea' into develop 2016-09-19 15:34:13 +02:00
Marion Muszynski
d9b117774d css fix 2016-09-19 15:33:43 +02:00
Marion Muszynski
5aac7f617b Merge branch 'ticket-8048' into develop 2016-09-19 12:42:21 +02:00
Marion Muszynski
dafde1fd0f Merge branch 'ticket-philea' 2016-09-19 11:58:48 +02:00
Marion Muszynski
a51cf6fb55 continuing to add some stuff 2016-09-19 11:58:14 +02:00
Marion Muszynski
50da985ca7 Merge branch 'ticket-philea' 2016-09-16 17:33:55 +02:00
Marion Muszynski
e1f82aba03 small fix 2016-09-16 17:33:23 +02:00
Marion Muszynski
d0b55456b9 Merge branch 'ticket-philea' 2016-09-16 17:18:04 +02:00
Marion Muszynski
4e42740019 message modification 2016-09-16 17:17:41 +02:00
Marion Muszynski
4179f1513d Merge branch 'ticket-philea' 2016-09-16 16:36:46 +02:00