Commit Graph

335 Commits

Author SHA1 Message Date
Michael RICOIS
922de8200a Fix quantity 2018-03-22 11:08:49 +01:00
Michael RICOIS
197f4161d1 Add New Import 2018-02-26 11:46:03 +01:00
Michael RICOIS
b3adf075e5 Quantity for return form 2018-01-17 11:56:50 +01:00
David
8194a1f247 Added transaction information on paypal/paybox orders 2018-01-16 18:07:49 +01:00
Michael RICOIS
191f9a3312 Icon for device in order details 2018-01-09 11:51:26 +01:00
David
e84e304c9e Merge branch 'ticket/r15172-change-adress-socol'
# Conflicts:
#	adm/tabs/AdminOrders.php
2018-01-02 10:20:01 +01:00
David
0868abc8ea no more checking for change 2017-12-29 18:12:55 +01:00
David
de0efe93eb Added modification button display in all conditions. 2017-12-29 15:52:23 +01:00
Michael RICOIS
3a5c74c325 Merge remote-tracking branch 'origin/ticket/14716-order-mobile' 2017-12-21 16:56:29 +01:00
Michael RICOIS
c650ee706c Display EDIT 2017-12-21 15:10:45 +01:00
Michael RICOIS
81b74686cf Remove invoice change 2017-12-21 12:34:58 +01:00
Michael RICOIS
ab11871b99 CS 2017-12-21 12:07:40 +01:00
Michael RICOIS
e200eb6c6f Fix bug presta afterUpdate 2017-12-21 11:49:19 +01:00
Michael RICOIS
5e3c35b95b Modification et affichage adresse socolissimo lorsque livraison domicile 2017-12-21 10:12:16 +01:00
Michael RICOIS
d5b292d911 Use appli col in ps_orders to know if the order is passed on mobile
website
2017-12-15 15:52:02 +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
c208067f4e Merge branch 'ticket-14436-WP' 2017-11-09 14:52:52 +01:00
Marion Muszynski
6330105f81 big inte of adminOrder view 2017-11-09 14:51:48 +01:00
Michael RICOIS
ccd3ebb1df Merge branch 'ticket-14666-appli-discount' 2017-11-08 10:35:44 +01:00
Michael RICOIS
d9bd62dba7 Merge branch 'ticket-14525-parrain' 2017-11-08 09:52:16 +01:00
Michael RICOIS
2fb0bd187d Discount only for applications 2017-11-06 12:00:30 +01:00
Michael RICOIS
bee38c462b Add condition following number of orders 2017-10-31 16:45:07 +01:00
Michael RICOIS
7bd7624200 Add sponsor from backoffice 2017-10-31 12:24:29 +01:00
Marion Muszynski
c25d0551cd remove console log 2017-10-30 14:41:37 +01:00
Marion Muszynski
07dd8ab9c9 test flush cache sale 2017-10-30 13:41:50 +01:00
Marion Muszynski
df7f31db0b module wp generation 2017-10-27 13:11:37 +02:00
Marion Muszynski
20ab1d75d9 change to update img promo banner 2017-10-24 18:24:17 +02: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
bd9cdc9cad add button to clean image positions 2017-10-10 15:29:25 +02:00
Marion Muszynski
ad291c9f99 move mobile imgage upload to adminprivatesalesale 2017-09-28 15:38:03 +02:00
Marion Muszynski
d286b61147 select distinct shipp numbers 2017-09-27 12:29:13 +02:00
Michael RICOIS
389c34f82e Merge branch 'ticket-14162-returnwithqty' 2017-09-26 15:35:10 +02:00
Michael RICOIS
96fe0dcd67 Update product-box size and truncate 2017-09-26 15:26:48 +02:00
Marion Muszynski
8fb28292b8 add drop shipping 2017-09-26 14:53:38 +02:00
Michael RICOIS
91e7139f34 Manage quantity in return form 2017-09-25 17:58:47 +02:00