Michael RICOIS
|
5980a64743
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-26 12:45:37 +01:00 |
|
Michael RICOIS
|
197f4161d1
|
Add New Import
|
2018-02-26 11:46:03 +01:00 |
|
Michael RICOIS
|
094f382eb5
|
Enhance customer search for discount
|
2018-02-23 16:12:06 +01:00 |
|
Michael RICOIS
|
96352f3042
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-02-23 12:36:35 +01:00 |
|
Michael RICOIS
|
d307e50f7f
|
Get back to date_upd
|
2018-02-23 12:19:46 +01:00 |
|
Michael RICOIS
|
71d44a1eb6
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-02-23 12:11:05 +01:00 |
|
Michael RICOIS
|
b87e937fbc
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-23 11:38:11 +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
|
b5307d448a
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-22 15:54:47 +01:00 |
|
Michael RICOIS
|
06413abad5
|
Fix var
|
2018-02-22 15:54:25 +01:00 |
|
Michael RICOIS
|
3497ca7675
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-21 17:12:36 +01:00 |
|
Michael RICOIS
|
7163d60447
|
Detect if is a full refund
|
2018-02-21 16:42:43 +01:00 |
|
Michael RICOIS
|
2c9155bc00
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-21 14:53:45 +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
|
013e705e94
|
Use date_add
|
2018-02-16 16:32:15 +01:00 |
|
Michael RICOIS
|
6aebf9206a
|
Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal' into develop
|
2018-02-12 11:58:09 +01:00 |
|
Michael RICOIS
|
d728c55633
|
Merge remote-tracking branch 'origin/ticket/r15931-contacts' into develop
|
2018-02-05 11:26:36 +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
|
a3f1529659
|
Merge branch 'ticket-14436-excel-format' into develop
|
2018-02-02 22:00:23 +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
|
f9ad9f344d
|
Merge branch 'ticket/r15334-return-article-form' into develop
|
2018-01-19 12:02:43 +01:00 |
|
Michael RICOIS
|
b3adf075e5
|
Quantity for return form
|
2018-01-17 11:56:50 +01:00 |
|
David
|
69500d338e
|
Merge branch 'ticket-15155-paypal-order-display' into develop
|
2018-01-16 18:17:22 +01:00 |
|
David
|
8194a1f247
|
Added transaction information on paypal/paybox orders
|
2018-01-16 18:07:49 +01:00 |
|
David
|
0c44a48f99
|
Merge branch 'fix/domain-issue-ajax-express-cart' into develop
|
2018-01-09 19:01:58 +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
|
392bccd110
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-29 18:13:34 +01:00 |
|
David
|
0868abc8ea
|
no more checking for change
|
2017-12-29 18:12:55 +01:00 |
|
David
|
657b39d532
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
# Conflicts:
# adm/tabs/AdminOrders.php
|
2017-12-29 15:55:01 +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
|
3dd620e9e9
|
Merge remote-tracking branch 'origin/master' into develop
|
2017-12-21 15:20:50 +01:00 |
|
Michael RICOIS
|
c650ee706c
|
Display EDIT
|
2017-12-21 15:10:45 +01:00 |
|
Michael RICOIS
|
6ab4df6b66
|
Merge remote-tracking branch 'origin/ticket/r15172-change-adress-socol' into develop
|
2017-12-21 12:36:32 +01:00 |
|
Michael RICOIS
|
81b74686cf
|
Remove invoice change
|
2017-12-21 12:34:58 +01:00 |
|
Michael RICOIS
|
cd393096c4
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-21 12:08:29 +01:00 |
|
Michael RICOIS
|
ab11871b99
|
CS
|
2017-12-21 12:07:40 +01:00 |
|
Michael RICOIS
|
422f7e9820
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-21 11:53:06 +01:00 |
|
Michael RICOIS
|
e200eb6c6f
|
Fix bug presta afterUpdate
|
2017-12-21 11:49:19 +01:00 |
|
Michael RICOIS
|
bbf2698b31
|
Merge branch 'ticket/r15172-change-adress-socol' into develop
|
2017-12-21 10:13:31 +01:00 |
|
Michael RICOIS
|
5e3c35b95b
|
Modification et affichage adresse socolissimo lorsque livraison domicile
|
2017-12-21 10:12:16 +01:00 |
|
Michael RICOIS
|
3fcceacb79
|
Merge branch 'ticket/14716-order-mobile' into develop
|
2017-12-15 15:55:23 +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
|
62ad2de197
|
Merge branch 'ticket-15062-confirmAlert' into develop
|
2017-12-07 16:29:50 +01:00 |
|