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

802 Commits

Author SHA1 Message Date
Marion Muszynski
854d8fe6f0 fix price 2016-07-28 13:35:24 +02:00
Marion Muszynski
141dbfda94 Merge branch 'ticket-criteo' 2016-07-28 13:27:45 +02:00
Marion Muszynski
14640d4601 Merge branch 'ticket-criteo' into develop 2016-07-28 13:27:19 +02:00
Marion Muszynski
2fe135dbce little mod 2016-07-28 13:26:58 +02:00
Marion Muszynski
794c5e7844 Merge branch 'ticket-criteo' 2016-07-28 12:31:10 +02:00
Marion Muszynski
fe85712667 Merge branch 'ticket-criteo' into develop 2016-07-28 12:30:04 +02:00
Marion Muszynski
285c610784 fix order 2016-07-28 12:29:45 +02:00
Marion Muszynski
08ab57a1f1 Merge branch 'ticket-criteo' 2016-07-28 12:12:10 +02:00
Marion Muszynski
4b20be7481 Merge branch 'ticket-criteo' into develop 2016-07-28 12:06:42 +02:00
Marion Muszynski
de5ea0a04a fix price quantity 2016-07-28 12:06:25 +02:00
Marion Muszynski
d9c89a94cc Merge branch 'ticket-criteo' 2016-07-28 11:54:34 +02:00
Marion Muszynski
d7f16471db Merge branch 'ticket-criteo' into develop 2016-07-28 11:53:32 +02:00
Marion Muszynski
7985bf0b78 small fix 2016-07-28 11:53:17 +02:00
Marion Muszynski
8993c8e126 Merge branch 'ticket-criteo' into develop 2016-07-28 11:49:12 +02:00
Marion Muszynski
6ed911b9d5 fix 2016-07-28 11:48:51 +02:00
Marion Muszynski
08d7951206 Merge branch 'ticket-criteo' into develop 2016-07-28 11:38:28 +02:00
Marion Muszynski
01cc230757 test for fix 2016-07-28 11:38:11 +02:00
Marion Muszynski
b0cce26e9f Merge branch 'ticket-criteo' 2016-07-28 10:51:01 +02:00
Marion Muszynski
606e4ef980 Merge branch 'ticket-criteo' into develop 2016-07-28 10:50:31 +02:00
Marion Muszynski
25075ae187 small modif 2016-07-28 10:50:05 +02:00
Marion Muszynski
cc08a0f084 Merge branch 'ticket-criteo' 2016-07-27 20:33:12 +02:00
Marion Muszynski
da4ba93d2f Merge branch 'ticket-criteo' into develop 2016-07-27 20:32:46 +02:00
Marion Muszynski
bf18b4925e fix 2016-07-27 20:32:27 +02:00
Marion Muszynski
5097cb50ad Merge branch 'ticket-criteo' 2016-07-27 20:25:55 +02:00
Marion Muszynski
e0ceaff8b9 Merge branch 'ticket-criteo' into develop 2016-07-27 20:25:24 +02:00
Marion Muszynski
5c90af9bee little fix 2016-07-27 20:25:04 +02:00
Marion Muszynski
9f2d22164b Merge branch 'ticket-criteo' 2016-07-27 20:15:06 +02:00
Marion Muszynski
01417c4859 Merge branch 'ticket-criteo' into develop 2016-07-27 20:10:46 +02:00
Marion Muszynski
b481e60b11 fix site version 2016-07-27 20:10:25 +02:00
Marion Muszynski
a6532f7848 Merge branch 'ticket-criteo' into develop 2016-07-27 19:52:52 +02:00
Marion Muszynski
0571982b45 ajust js tag 2016-07-27 19:52:24 +02:00
Marion Muszynski
dea3180ba6 Merge branch 'ticket-criteo' 2016-07-27 19:33:17 +02:00
Marion Muszynski
269e97a295 Merge branch 'ticket-criteo' into develop 2016-07-27 19:32:38 +02:00
Marion Muszynski
dd941581b7 fix url 2016-07-27 19:32:15 +02:00
Marion Muszynski
36352f9187 Merge branch 'ticket-criteo' 2016-07-27 19:29:58 +02:00
Marion Muszynski
aa81282b02 Merge branch 'ticket-criteo' into develop 2016-07-27 19:29:32 +02:00
Marion Muszynski
c7f9b261c3 modif url in cron 2016-07-27 19:29:09 +02:00
Marion Muszynski
0c40f60da5 Merge branch 'ticket-payboxAgreement' into develop 2016-07-27 19:17:40 +02:00
Marion Muszynski
c678be4b21 small fix 2016-07-27 18:56:17 +02:00
Marion Muszynski
94ac58ae4b Merge branch 'ticket-criteo' 2016-07-27 17:50:16 +02:00
Marion Muszynski
53c3eb2a12 Merge branch 'ticket-criteo' into develop 2016-07-27 17:49:56 +02:00
Marion Muszynski
9fabb9b7af fix 2016-07-27 17:49:29 +02:00
Marion Muszynski
32d3923948 Merge branch 'ticket-criteo' 2016-07-27 17:47:48 +02:00
Marion Muszynski
c21b4b906c Merge branch 'ticket-criteo' into develop 2016-07-27 17:46:04 +02:00
Marion Muszynski
d2452448fc fix label in config module 2016-07-27 17:45:44 +02:00
Marion Muszynski
2210cf508e Merge branch 'ticket-criteo' into develop 2016-07-27 17:43:09 +02:00
Marion Muszynski
fbd9dafcac modif url product 2016-07-27 17:42:44 +02:00
Marion Muszynski
69731d8590 Merge branch 'ticket-criteo' 2016-07-27 17:06:02 +02:00
Marion Muszynski
492f14f02c Merge remote-tracking branch 'origin/ticket-blockOrderSummary' 2016-07-27 16:35:50 +02:00
Marion Muszynski
90b790bcab Merge branch 'ticket-criteo' into develop 2016-07-25 16:40:58 +02:00
Marion Muszynski
fe32da2f12 add module criteo_bbb 2016-07-25 16:40:22 +02:00
Marion Muszynski
6711926ac3 fix conflicts 2016-07-25 15:26:26 +02:00
Marion Muszynski
02f21d3b21 Merge branch 'ticket-deliveryDelay_product' into develop 2016-07-25 14:31:54 +02:00
Marion Muszynski
1694bf54d1 standardization date estimation part 2 2016-07-25 14:31:22 +02:00
Marion Muszynski
2ca8f150ca Merge branch 'ticket-blockOrderSummary' into develop 2016-07-25 12:23:11 +02:00
Marion Muszynski
bb0cd59d0b adjusting date delivery 2016-07-25 12:22:50 +02:00
Marion Muszynski
c809342939 Merge branch 'ticket-deliveryDelay_product' into develop 2016-07-25 12:06:23 +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
4734f5dabb Merge branch 'ticket-blockOrderSummary' 2016-07-25 11:23:55 +02:00
Marion Muszynski
50ddbe95b3 comment date estimation, waiting for good calcul method 2016-07-25 11:23:29 +02:00
Marion Muszynski
f1769755de Merge branch 'ticket-blockOrderSummary' into develop 2016-07-25 11:18:16 +02:00
Marion Muszynski
dd6a758e32 modif css 2016-07-25 11:17:40 +02:00
Marion Muszynski
1c1485e4d7 Merge branch 'ticket-blockOrderSummary' into develop 2016-07-25 10:52:06 +02:00
Marion Muszynski
b1ecd00e3e modif for delivery delay 2016-07-25 10:51:39 +02:00
Marion Muszynski
97aa768b07 Merge branch 'ticket-payboxAgreement' into develop 2016-07-18 12:58:48 +02:00
Marion Muszynski
5881036918 fix 2016-07-18 12:58:22 +02:00
Marion Muszynski
a65cb5e4d9 Merge branch 'ticket-payboxAgreement' into develop 2016-07-18 12:47:23 +02:00
Marion Muszynski
3eea78480e fixes 2016-07-18 12:46:58 +02:00
Marion Muszynski
4fd07ebcd3 Merge branch 'ticket-payboxAgreement' into develop 2016-07-18 12:12:50 +02:00
Marion Muszynski
46581396ce savecb 2016-07-18 12:12:26 +02:00
Marion Muszynski
6c66cfa9d0 Merge branch 'ticket-payboxAgreement' into develop 2016-07-18 11:53:59 +02:00
Marion Muszynski
0b5cb21977 small fix 2016-07-18 11:53:37 +02:00
Marion Muszynski
a2e67137bf Merge branch 'ticket-payboxAgreement' into develop 2016-07-18 11:45:49 +02:00
Marion Muszynski
fb51c877c4 suite save paybox info 2016-07-18 11:45:18 +02:00
Marion Muszynski
21f6251aa3 Merge branch 'ticket-payboxAgreement' into develop 2016-07-15 17:57:12 +02:00
Marion Muszynski
5ae34ea5ab fix 2016-07-15 17:56:41 +02:00
Marion Muszynski
354e020c68 fix conflict 2016-07-15 17:50:32 +02:00
Marion Muszynski
5dbd39aadd first commit to save paybox cards 2016-07-15 17:49:13 +02:00
Marion Muszynski
b2658bb5db Merge branch 'ticket-blockOrderSummary' into develop 2016-07-15 12:50:02 +02:00
Marion Muszynski
5994e715e1 fix 2016-07-15 12:49:39 +02:00
Marion Muszynski
a21a7bbc0e Merge branch 'ticket-blockOrderSummary' into develop 2016-07-15 12:28:47 +02:00
Marion Muszynski
b8a4934278 adding delivery date estimation 2016-07-15 12:26:58 +02:00
Marion Muszynski
370fb8dd18 Merge branch 'ticket-blockOrderSummary' into develop 2016-07-13 15:39:52 +02:00
Marion Muszynski
e33d2da73d adjusting for delivery delay part 2016-07-13 15:35:00 +02:00
Marion Muszynski
951ffd3e4b Merge branch 'ticket-blockOrderSummary' into develop 2016-07-13 15:17:13 +02:00
Marion Muszynski
dee3c2ba2c ajusting css 2016-07-13 15:16:48 +02:00
Marion Muszynski
98b264471c Merge branch 'ticket-blockOrderSummary' into develop 2016-07-13 15:10:48 +02:00
Marion Muszynski
67314cbf25 hide bestsellers at payment step 2016-07-13 15:09:33 +02:00
Marion Muszynski
2b9fd29308 Merge branch 'ticket-invoiceOrderBy' 2016-07-13 10:59:09 +02:00
Marion Muszynski
4b46c90929 Merge branch 'ticket-10444' into develop 2016-07-12 17:59:41 +02:00
Marion Muszynski
4acaacaaa8 other modif 2016-07-12 17:59:18 +02:00
Marion Muszynski
a8136e01e3 Merge branch 'ticket-10444' into develop 2016-07-12 17:36:04 +02:00
Marion Muszynski
c0117d7819 good modif 2016-07-12 17:35:38 +02:00
Marion Muszynski
d2065341b2 Merge branch 'ticket-10444' into develop 2016-07-12 16:59:40 +02:00
Marion Muszynski
fd51d7f449 small update 2016-07-12 16:59:11 +02:00
Marion Muszynski
6ecf465e1e Merge branch 'ticket-10444' into develop 2016-07-12 16:23:42 +02:00
Marion Muszynski
5303ef1b06 update BDC sale state 2016-07-12 16:23:23 +02:00
Marion Muszynski
489b94cff5 suite block order summary 2016-07-12 14:50:52 +02:00
Marion Muszynski
b03c5cf0b9 add logo 2016-07-11 17:43:10 +02:00
Marion Muszynski
f754060f1d Merge branch 'ticket-invoiceOrderBy' into develop 2016-07-11 17:06:35 +02:00
Marion Muszynski
df1e423c9c modif order way 2016-07-11 17:06:11 +02:00
Marion Muszynski
a7ce4edbb2 Merge branch 'ticket-invoiceOrderBy' into develop 2016-07-11 16:15:28 +02:00
Marion Muszynski
ebd46063eb small mod 2016-07-11 16:15:04 +02:00
Marion Muszynski
9284fe3daa Merge branch 'ticket-invoiceOrderBy' into develop 2016-07-11 16:13:49 +02:00
Marion Muszynski
fce857f676 update order way M2 2016-07-11 16:13:21 +02:00
Marion Muszynski
d4739925e0 Merge branch 'ticket-invoiceOrderBy' into develop 2016-07-11 14:44:45 +02:00
Marion Muszynski
d1c984cb76 update sort invoice 2016-07-11 14:44:19 +02:00
Marion Muszynski
4874515f50 Merge branch 'ticket-updatePendingOrder' into develop 2016-07-11 12:36:06 +02:00
Marion Muszynski
7faebc96f0 small js update in adminlogisticpending 2016-07-11 12:35:41 +02:00
Marion Muszynski
d2ec1e1de8 adding module blockordersummary 2016-07-08 17:51:48 +02:00
Marion Muszynski
91fc9ee7dc update order invoice 2016-07-08 16:03:19 +02:00
Srv Bebeboutik
4a93e29747 modif prod, remove log email sending to us 2016-07-08 15:52:31 +02:00
Marion Muszynski
e489a60c90 Merge branch 'ticket-simplemulti_invoice' 2016-07-08 10:52:17 +02:00
Marion Muszynski
d7f6930236 Merge branch 'ticket-simplemulti_bdc' 2016-07-08 10:47:49 +02:00
Marion Muszynski
b574168fbd Merge branch 'ticket-saveCB' into develop 2016-07-06 17:44:24 +02:00
Marion Muszynski
c094b31fa5 modif retour pbx 2016-07-06 17:42:20 +02:00
Marion Muszynski
590acadfe6 Merge branch 'ticket-saveCB' into develop 2016-07-06 16:16:46 +02:00
Marion Muszynski
08b8f39607 adding param en paiement.php 2016-07-06 16:16:26 +02:00
Srv Bebeboutik
7701a95063 fix from prod 2016-07-06 16:07:22 +02:00
Marion Muszynski
0f05a15e94 Merge branch 'ticket-preheaderRSS' 2016-07-06 15:33:48 +02:00
Marion Muszynski
47e637644d add U param in response paybox 2016-07-06 15:22:41 +02:00
Marion Muszynski
200ab432b5 fix conflicts 2016-07-06 12:38:35 +02:00
Marion Muszynski
7f6949043e adding various description blocks in Admin product edit fast 2016-07-06 12:14:28 +02:00
Marion Muszynski
53f957ee12 Merge branch 'ticket-saveCB' into develop 2016-07-05 16:57:51 +02:00
Marion Muszynski
9954f14c25 modif test 2016-07-05 16:57:30 +02:00
Marion Muszynski
28af6d6754 Merge branch 'ticket-saveCB' into develop 2016-07-05 16:39:51 +02:00
Marion Muszynski
76db559d5d modif 2016-07-05 16:39:25 +02:00
Marion Muszynski
6019923f31 Merge branch 'ticket-saveCB' into develop 2016-07-05 16:32:03 +02:00
Marion Muszynski
23c48db97a modif 2016-07-05 16:31:37 +02:00
Marion Muszynski
eb287fb353 Merge branch 'ticket-saveCB' into develop 2016-07-05 16:11:49 +02:00
Marion Muszynski
93b819a577 test with CB trace 2016-07-05 16:07:39 +02:00
Marion Muszynski
0afcb1d071 Merge branch 'ticket-saveCB' into develop 2016-07-05 15:41:36 +02:00
Marion Muszynski
b4949f8792 test 2016-07-05 15:41:14 +02:00
Marion Muszynski
f0ed6152a2 Merge branch 'ticket-saveCB' into develop 2016-07-05 15:31:03 +02:00
Marion Muszynski
75e3ab7177 adding return params 2016-07-05 15:30:42 +02:00
Marion Muszynski
7c11020cdd Merge branch 'ticket-10363' into develop 2016-07-05 15:11:52 +02:00
Marion Muszynski
e79421073d adding pending orders to stock report 2016-07-05 15:11:33 +02:00
Marion Muszynski
e6859f7a85 Merge branch 'ticket-preheaderRSS' into develop 2016-07-04 18:20:24 +02:00
Marion Muszynski
95b176601a adding preheader rss emarsys 2016-07-04 18:20:03 +02:00
Marion Muszynski
3be779d03b Merge branch 'ticket-simplemulti_logistic' 2016-07-04 16:58:23 +02:00
Marion Muszynski
c7aa42f883 fix conflict 2016-07-01 11:20:49 +02:00
Srv Bebeboutik
c48e673922 fix prod 2016-06-30 11:31:11 +02:00
Marion Muszynski
699a06db48 fix conflict 2016-06-30 11:15:14 +02:00
Marion Muszynski
e7f0c678de fix conflict 2016-06-29 15:53:34 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
69bf2773e6 Merge branch 'ticket-blockbestsellerProduct' into develop 2016-06-28 16:16:02 +02:00
Marion Muszynski
e6585427ee fix 2016-06-28 16:15:41 +02:00
Marion Muszynski
2b726927cf Merge branch 'ticket-blockbestsellerProduct' into develop 2016-06-28 16:07:49 +02:00
Marion Muszynski
10ad346ad5 modif idcombination 2016-06-28 16:07:29 +02:00
Marion Muszynski
18238f3c9d Merge branch 'ticket-blockbestsellerProduct' into develop 2016-06-28 15:03:29 +02:00
Marion Muszynski
163cc3ac04 adding html bind 2016-06-28 15:03:07 +02:00
Marion Muszynski
757c557a07 fix conflict 2016-06-28 14:47:38 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Marion Muszynski
a72fdf8da2 Merge branch 'ticket-blockbestsellerProduct' into develop 2016-06-24 14:03:16 +02:00
Marion Muszynski
43646dd4bd modif 2016-06-24 13:54:50 +02:00
Marion Muszynski
f57b04dbde fix conflict 2016-06-24 12:43:26 +02:00
Marion Muszynski
985bf52e83 update to add product with attribute to cart from bestsellers 2016-06-24 12:41:46 +02:00
Marion Muszynski
22a8b5cac1 Merge branch 'ticket-8039' into develop 2016-06-22 17:23:56 +02:00
Marion Muszynski
7043f4b24a other fix 2016-06-22 17:23:34 +02:00
Marion Muszynski
224267f45c Merge branch 'ticket-8039' into develop 2016-06-22 17:08:37 +02:00
Marion Muszynski
a6c46f9077 petit fix before prod 2016-06-22 17:08:09 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
f41acac7ad Merge branch 'ticket-simplemulti_logistic' into develop 2016-06-22 11:27:13 +02:00
Marion Muszynski
ae50025d14 continuing updating 2016-06-22 11:26:51 +02:00
Marion Muszynski
56c4006da3 Merge branch 'ticket-simplemulti_logistic' into develop 2016-06-21 17:18:51 +02:00
Marion Muszynski
8ebec9fb3e addind admin pending orders 2016-06-21 17:18:24 +02:00
Marion Muszynski
c442173cb8 add nex adminTab 2016-06-20 18:27:54 +02:00
Marion Muszynski
6dfa3c18b1 Merge branch 'ticket-simplemulti_logistic' into develop 2016-06-20 15:32:28 +02:00
Marion Muszynski
c29d8725ac add status modify button 2016-06-20 15:32:06 +02:00
Marion Muszynski
6265c1b2af begin update adminlogistic 2016-06-20 15:09:13 +02:00
Marion Muszynski
50010e70c3 Merge branch 'ticket-simplemulti_invoice' into develop 2016-06-20 12:57:23 +02:00
Marion Muszynski
ad30bb51a4 modif in Sale function for M2 2016-06-20 12:56:59 +02:00
Marion Muszynski
ff30aab5d5 Merge branch 'ticket-simplemulti_invoice' into develop 2016-06-20 12:49:51 +02:00
Marion Muszynski
3d4d7b16e2 update invoice 2016-06-20 12:49:32 +02:00
Marion Muszynski
1bfd79afb9 Merge branch 'ticket-simplemulti_bdc' into develop 2016-06-20 11:02:00 +02:00
Marion Muszynski
56163f32ab update bdc log 2016-06-20 11:01:39 +02:00
Marion Muszynski
62009ba633 Merge branch 'ticket-8039' into develop 2016-06-10 16:50:05 +02:00
Marion Muszynski
7af6d9ccd7 adding bg for sale 2016-06-10 16:49:43 +02:00
Marion Muszynski
40ab87cd45 update request deb expe 2016-06-10 11:55:09 +02:00
Marion Muszynski
182a608e3b little update in request 2016-06-10 10:22:26 +02:00
Marion Muszynski
650473ff85 Merge branch 'ticket-10169' into develop 2016-06-08 17:44:41 +02:00
Marion Muszynski
1615e9a452 adding fields in sale exports 2016-06-08 17:44:21 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
1b2020f041 Merge branch 'ticket-fidelite' into develop 2016-06-08 16:28:25 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
60996f7bcf Merge branch 'ticket-fidelite' 2016-06-08 12:26:28 +02:00
Marion Muszynski
eafb801028 Merge branch 'ticket-fidelite' into develop 2016-06-08 12:25:26 +02:00
Marion Muszynski
c0836540bc delete some stuff about categories 2016-06-08 12:25:05 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
f01b450dc3 Merge branch 'ticket-fidelite' into develop 2016-06-08 12:15:18 +02:00
Marion Muszynski
e7ce0ecb86 opti request suite 2016-06-08 12:14:54 +02:00
Marion Muszynski
775276a367 Merge branch 'ticket-fidelite' into develop 2016-06-08 12:02:38 +02:00
Marion Muszynski
e9300ff725 opti request 2 2016-06-08 12:02:16 +02:00
Marion Muszynski
8fc47d1d6e Merge branch 'ticket-fidelite' into develop 2016-06-08 11:44:35 +02:00
Marion Muszynski
83c4acc83d opti request 2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
4148656a60 Merge branch 'ticket-8041' into develop 2016-06-07 17:43:19 +02:00
Marion Muszynski
577249435f Merge branch 'ticket-10122' 2016-06-07 17:00:06 +02:00
Marion Muszynski
a49e70ff08 Merge branch 'ticket-10122' into develop 2016-06-07 16:40:41 +02:00
Marion Muszynski
5f21c6d3b2 update braderie 2016-06-07 16:40:19 +02:00
Srv Bebeboutik
3ba607554c modif end sale 2016-06-07 16:02:16 +02:00
Marion Muszynski
5a7e53a116 fix conflicts 2016-06-07 14:45:26 +02:00
Marion Muszynski
fb26faeb8e suite update braderie 2016-06-07 14:42:40 +02:00
Marion Muszynski
9212b8e84d petit fix sur la braderie 2016-06-07 13:02:03 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Thibault UBUNTU
2cf5555949 Merge branch 'dylan_9894' 2016-06-07 12:16:21 +02:00
Dylan Travers
b4298189dc ca me gonfle !! 2016-06-07 11:58:31 +02:00
Dylan Travers
a542baf9b0 Add extrafield and date_end to newsletter. Ticket N°9894 2016-06-07 11:48:20 +02:00
Srv Bebeboutik
49e26669a9 modif from prod 2016-06-07 11:22:35 +02:00
Dylan Travers
d099294e5f Fix error alert message of ticket 9198 2016-06-07 10:20:29 +02:00
Dylan Travers
9b8795607a Ajout de la phrase du ticket N°9891 2016-06-06 18:10:47 +02:00
Dylan Travers
54b10d9432 Ajout de la phrase demandée dans le ticket N°9891 2016-06-06 18:02:02 +02:00
Marion Muszynski
7065edffe4 fix conflict 2016-06-06 17:42:00 +02:00
Marion Muszynski
7ad38029da adding filter 2016-06-06 17:27:09 +02:00
Srv Bebeboutik
bec4b56f27 modif from prod to get real numbers for export 2016-06-06 15:32:42 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Srv Bebeboutik
a4a5f4850d petite modif from prod 2016-06-06 10:24:06 +02:00
Srv Bebeboutik
e26cefa86a modif prod 2016-06-06 10:14:02 +02:00
Srv Bebeboutik
368307c6e2 modif from prod 2016-06-03 17:04:45 +02:00
Marion Muszynski
5ad50e700a Merge branch 'ticket-fidelite' into develop 2016-06-03 16:34:55 +02:00
Marion Muszynski
2dc90dc0c6 update to get Cart loyalty credit value without considering discount in total cart 2016-06-03 16:34:30 +02:00
Srv Bebeboutik
b1a0a1b29e small commit from prod 2016-06-03 11:18:35 +02:00
Marion Muszynski
c7dac58b08 Merge branch 'ticket-fidelite' into develop 2016-05-30 17:04:57 +02:00
Marion Muszynski
e92682d851 modif tpl loyalty program 2016-05-30 17:04:26 +02:00
Marion Muszynski
eb184fee4e Merge branch 'ticket-fidelite' into develop 2016-05-30 16:31:03 +02:00
Marion Muszynski
02037dda1a fix ratio 2016-05-30 16:30:32 +02:00
Marion Muszynski
2b14f9bd61 Merge branch 'ticket-dropshipping' into develop 2016-05-30 15:42:50 +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
da020d7bc2 Merge branch 'ticket-phoneSocol' into develop 2016-05-30 10:50:22 +02:00
Marion Muszynski
7e74c8b58a modif to take phone number if no mobile phone 2016-05-27 17:22:48 +02:00
Srv Bebeboutik
2f6c21e7fb push de la prod 2016-05-27 16:59:18 +02:00
Marion Muszynski
cb02563fa9 Merge branch 'ticket-updateStats' 2016-05-27 15:01:42 +02:00
Marion Muszynski
722713d96c test 2016-05-27 15:01:16 +02:00
Marion Muszynski
83e9e484ef Merge branch 'ticket-updateStats' 2016-05-27 14:58:30 +02:00
Marion Muszynski
a8bdea5899 opti again 2016-05-27 14:58:08 +02:00
Marion Muszynski
a2084bd3cf Merge branch 'ticket-updateStats' 2016-05-27 12:57:53 +02:00
Marion Muszynski
b59c00ffcd adding another reason 2016-05-27 12:57:32 +02:00
Marion Muszynski
b135394369 Merge branch 'ticket-updateStats' 2016-05-27 12:42:39 +02:00
Marion Muszynski
40680b0020 opti export 2016-05-27 12:42:09 +02:00
Marion Muszynski
b3956b5592 Merge branch 'ticket-updateStats' 2016-05-27 12:36:23 +02:00
Marion Muszynski
d3b2f14bc9 continuing... 2016-05-27 12:35:51 +02:00
Marion Muszynski
5e3f9a31e7 Merge branch 'ticket-updateStats' 2016-05-27 11:27:53 +02:00
Marion Muszynski
2ce1f5fafe continuing of otpi 2016-05-27 11:27:09 +02:00
Marion Muszynski
b63707f242 Merge branch 'ticket-updateStats' 2016-05-27 10:45:58 +02:00
Marion Muszynski
067eebea21 beginning of opti requete export 2016-05-27 10:45:22 +02:00
Marion Muszynski
750779f200 Merge branch 'ticket-updateStats' 2016-05-27 10:23:16 +02:00
Marion Muszynski
504aa9ba35 Merge branch 'ticket-updateStats' into develop 2016-05-27 10:19:39 +02:00
Marion Muszynski
3b8156458b adding export remb 2016-05-27 10:19:09 +02:00
Marion Muszynski
f5737b2818 Merge branch 'ticket-updateBraderie' into develop 2016-05-26 17:52:41 +02:00
Marion Muszynski
ab70428dd4 update braderie 2016-05-26 17:50:44 +02:00