Marion Muszynski
|
d251c3f8d6
|
Merge branch 'ticket-9728' into develop
|
2016-08-25 13:01:37 +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 |
|
Marion Muszynski
|
4756a312ac
|
Merge branch 'evo-9386' into develop
|
2016-08-24 12:34:54 +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
|
2b47a5c932
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 12:48:41 +02:00 |
|
Marion Muszynski
|
8ca7d2b05b
|
standardization date estimation
|
2016-07-25 12:48:21 +02:00 |
|
Marion Muszynski
|
0ccf7667a6
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-25 12:20:03 +02:00 |
|
Marion Muszynski
|
e69073572e
|
modif date
|
2016-07-25 12:19:36 +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
|
64a8296a57
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-13 17:41:53 +02:00 |
|
Marion Muszynski
|
a6ec43bb68
|
showing estimation delivery date in cart
|
2016-07-13 17:40:13 +02:00 |
|
Marion Muszynski
|
7fe43c37b0
|
fix conflict
|
2016-07-13 16:38:47 +02:00 |
|
Marion Muszynski
|
02af220b58
|
showing delivery delay estimation on product tpl
|
2016-07-13 16:37:00 +02:00 |
|
Marion Muszynski
|
155dd48cad
|
fix conflict
|
2016-07-01 11:02:09 +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 |
|