Michael RICOIS
|
1d5578d66b
|
Merge remote-tracking branch 'origin/ticket-14739-PackLogistic'
|
2018-03-27 10:20:34 +02:00 |
|
Michael RICOIS
|
922de8200a
|
Fix quantity
|
2018-03-22 11:08:49 +01:00 |
|
Michael RICOIS
|
9e386209d7
|
Fix
|
2018-03-08 17:24:53 +01:00 |
|
Michael RICOIS
|
87387701c3
|
Remove ajax cache
|
2018-03-08 17:14:38 +01:00 |
|
Michael RICOIS
|
322c019c5c
|
Merge remote-tracking branch 'origin/ticket/r16159-customer-message'
|
2018-03-05 09:49:15 +01:00 |
|
Michael RICOIS
|
c09fe7c1fb
|
Fix switch
|
2018-03-02 11:38:32 +01:00 |
|
Michael RICOIS
|
056d5a9f3f
|
Country display
|
2018-03-02 10:44:07 +01:00 |
|
Michael RICOIS
|
8288c15333
|
Enhance customer search for discount
|
2018-02-26 12:20:35 +01:00 |
|
Michael RICOIS
|
b9016d4131
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-26 11:50:28 +01:00 |
|
Michael RICOIS
|
197f4161d1
|
Add New Import
|
2018-02-26 11:46:03 +01:00 |
|
Michael RICOIS
|
d307e50f7f
|
Get back to date_upd
|
2018-02-23 12:19:46 +01:00 |
|
Michael RICOIS
|
78ec506d8b
|
Change detection of complete order refund, and change state of order
|
2018-02-23 11:22:14 +01:00 |
|
Michael RICOIS
|
cf142b7071
|
CS
|
2018-02-22 17:54:49 +01:00 |
|
Michael RICOIS
|
b98aad808b
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-22 16:05:43 +01:00 |
|
Michael RICOIS
|
06413abad5
|
Fix var
|
2018-02-22 15:54:25 +01:00 |
|
Michael RICOIS
|
d303a06b7e
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-21 17:21:32 +01:00 |
|
Michael RICOIS
|
7163d60447
|
Detect if is a full refund
|
2018-02-21 16:42:43 +01:00 |
|
Michael RICOIS
|
af4f1270c8
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-21 14:54:23 +01:00 |
|
Michael RICOIS
|
8c24fe9fc6
|
Display items refund
|
2018-02-21 14:53:13 +01:00 |
|
Michael RICOIS
|
f82639ca09
|
Save refund message and transaction for shipping cost
|
2018-02-21 13:04:53 +01:00 |
|
Michael RICOIS
|
395aa0cd8a
|
Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal'
|
2018-02-21 09:43:41 +01:00 |
|
Michael RICOIS
|
013e705e94
|
Use date_add
|
2018-02-16 16:32:15 +01:00 |
|
Michael RICOIS
|
3769c8fc5c
|
Remove condition
|
2018-02-05 11:26:14 +01:00 |
|
David
|
dd923fa2d7
|
Merge branch 'ticket-14436-excel-format'
|
2018-02-02 22:01:19 +01:00 |
|
David
|
7c218242be
|
Added doubled ean recovery options
|
2018-02-02 21:59:26 +01:00 |
|
Michael RICOIS
|
3aca7c4e2e
|
Add hookCancelShipping
|
2018-01-29 16:47:51 +01:00 |
|
Michael RICOIS
|
b907ac0e66
|
CS
|
2018-01-26 11:56: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 |
|