Commit Graph

49 Commits

Author SHA1 Message Date
Michael RICOIS
5e3c35b95b Modification et affichage adresse socolissimo lorsque livraison domicile 2017-12-21 10:12:16 +01:00
Marion Muszynski
0d3ed321cf add confirm box on paypal refund button 2017-12-07 16:29:31 +01:00
root
78df0048af fix from prod 2017-12-07 15:08:30 +01:00
Marion Muszynski
46ec23fd24 fix column width 2017-12-07 14:49:40 +01:00
Marion Muszynski
c85e23079b add png image 2017-12-07 14:46:19 +01:00
Marion Muszynski
e663de7dc6 add picto for appli orders in admin order listing 2017-12-07 11:10:14 +01:00
root
93fd9f929c fix return condition 2017-12-07 10:55:49 +01:00
root
aa2f9b98cf fix from prod adminOrders 2017-12-07 10:37:27 +01:00
root
c29293c7ae push from prod 2017-12-04 11:27:43 +01:00
Marion Muszynski
c84c8f7663 Merge branch 'refonte-adminOrderTpl' 2017-12-04 10:25:31 +01:00
Marion Muszynski
b1b63b937d order comes from appli information 2017-11-21 14:28:24 +01:00
Marion Muszynski
a9a557adf9 show if order comes from api or website 2017-11-20 11:32:59 +01:00
Marion Muszynski
60b061fc47 continuation 2017-11-20 11:11:18 +01:00
Michael RICOIS
a6942a1356 Add a var when shipping is refund 2017-11-14 11:37:27 +01:00
Marion Muszynski
3a9f7ef77c part 2 of inte 2017-11-13 17:13:07 +01:00
Marion Muszynski
6330105f81 big inte of adminOrder view 2017-11-09 14:51:48 +01:00
Marion Muszynski
1dc2a7f6b2 fix conflict 2017-10-17 16:29:54 +02:00
Marion Muszynski
5600a6da36 fix returnable qty 2017-10-11 16:14:59 +02:00
Marion Muszynski
902de142ed indication of shipping everywhere 2017-10-11 13:24:49 +02:00
Marion Muszynski
d286b61147 select distinct shipp numbers 2017-09-27 12:29:13 +02:00
Marion Muszynski
7bbcc3eb59 add expedition date on adminorder 2017-09-22 15:31:16 +02:00
Marion Muszynski
b46e35c500 indication of order carrier in order list 2017-08-25 10:44:59 +02:00
Marion Muszynski
4a5aa5c7c4 add discount and mr shipping numbers 2017-08-17 15:52:58 +02:00
Marion Muszynski
e6a7ab447d add name of product in demand in adminOrder 2017-07-28 12:36:49 +02:00
Marion Muszynski
4589c86bb5 add module ant supplier demand 2017-07-13 16:46:11 +02:00
Marion Muszynski
a2a0385822 upgrading of return process 2017-06-26 11:52:56 +02:00
Marion Muszynski
b954a729a4 addition of return comment 2017-06-08 16:05:19 +02:00
Marion Muszynski
bed6683539 fix and add shipping number list in order 2017-06-07 15:07:19 +02:00
Marion Muszynski
be7863e514 fix instructions and reasons 2017-06-06 11:57:55 +02:00
Marion Muszynski
b615e9eadb addition of order return history 2017-05-31 16:58:27 +02:00
Marion Muszynski
66dea81ece addition of label generation to resend parcel 2017-05-29 16:17:54 +02:00
Marion Muszynski
6b70af5e17 prevent restock when product is in braderie 2017-05-02 10:44:13 +02:00
Marion Muszynski
11790c0eff prevent restockage when it s sent by philea 2017-04-25 15:03:41 +02:00
Marion Muszynski
db43bc59df modification of instructions 2017-03-21 11:22:28 +01:00
Marion Muszynski
29d133070d fix re-sending return instructions 2017-03-07 17:49:34 +01:00
Marion Muszynski
29a1b8a743 addition of button to resend return instruction 2017-03-07 17:33:22 +01:00
Marion Muszynski
a099f27ab0 comment paid option for mondial relay return to be enabled later 2017-02-27 10:31:48 +01:00
Marion Muszynski
3b7bde22db addition of mondial relay return process in adminOrder 2017-02-06 16:07:35 +01:00
Marion Muszynski
bdb9cf6b29 fix vaucher calue in mail sent 2017-01-09 12:09:25 +01:00
Marion Muszynski
a29a54f41e addition of new discount of 5 for missing product 2017-01-09 12:03:58 +01:00
Marion Muszynski
589ed49b8a keeping new status for the first order 2016-12-23 13:59:26 +01:00
Marion Muszynski
45a39353ab addition of shipping number in admin order 2016-11-03 11:27:56 +01:00
Marion Muszynski
3f2345c222 small fix 2016-09-15 15:37:44 +02:00
Marion Muszynski
6304de6703 fix of unknown function 2016-09-15 12:07:03 +02:00
Marion Muszynski
72b189c33d addition of lapostews package checking 2016-09-15 11:42:21 +02:00
Marion Muszynski
ac2de48ccc case when it s already in partial and we cancel the last product to send 2016-09-15 10:24:53 +02:00
Marion Muszynski
b6a69ec6a3 modif current state when product is refund on partial sent order 2016-09-12 17:08:25 +02:00
Marion Muszynski
7e7b335749 modif filter adminOrder 2016-05-13 10:41:09 +02:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00