Michael RICOIS
|
45d340ac64
|
Reset global value
|
2018-02-28 17:37:15 +01:00 |
|
Michael RICOIS
|
92415523d0
|
Merge branch 'ticket/r16112-display-credit'
|
2018-02-28 11:27:53 +01:00 |
|
Michael RICOIS
|
af201001f1
|
Display credit on standard customer
|
2018-02-28 11:14:09 +01:00 |
|
Michael RICOIS
|
95ff7a4323
|
Merge branch 'ticket/r16345-lang'
|
2018-02-27 16:18:11 +01:00 |
|
Michael RICOIS
|
63e1e1eae5
|
Merge branch 'ticket/r16112-display-credit'
|
2018-02-27 16:17:18 +01:00 |
|
Michael RICOIS
|
427258606c
|
CS
|
2018-02-27 14:36:05 +01:00 |
|
Michael RICOIS
|
563bd0c7df
|
Change display
|
2018-02-27 10:44:27 +01:00 |
|
Michael RICOIS
|
9450f9f0de
|
Clean mail translation
|
2018-02-26 17:08:23 +01:00 |
|
Michael RICOIS
|
7cea4e23ba
|
Language
|
2018-02-26 16:13:35 +01:00 |
|
Michael RICOIS
|
613411ea4a
|
Encode
|
2018-02-26 15:50:21 +01:00 |
|
Michael RICOIS
|
73563b0ca8
|
Remove .hg
|
2018-02-26 15:30:58 +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
|
78ec506d8b
|
Change detection of complete order refund, and change state of order
|
2018-02-23 11:22:14 +01:00 |
|
Michael RICOIS
|
d5b1691ebf
|
Merge branch 'fix/imageResize'
|
2018-02-22 16:28:11 +01:00 |
|
Michael RICOIS
|
a4edf0dbc1
|
Image lib
|
2018-02-22 16:23:41 +01:00 |
|
Michael RICOIS
|
b98aad808b
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-22 16:05:43 +01:00 |
|
Michael RICOIS
|
f514096c98
|
Merge branch 'fix/imageResize'
|
2018-02-22 16:03:42 +01:00 |
|
Michael RICOIS
|
06413abad5
|
Fix var
|
2018-02-22 15:54:25 +01:00 |
|
Michael RICOIS
|
834fbe9348
|
Merge branch 'ticket/r14647-welcome-mail'
Conflicts:
.gitignore
mails/es/account.html
mails/es/account.txt
|
2018-02-22 09:41:10 +01:00 |
|
Michael RICOIS
|
48f2940d2d
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-22 09:35:41 +01:00 |
|
Michael RICOIS
|
d303a06b7e
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-21 17:21:32 +01:00 |
|
Michael RICOIS
|
3644f8968e
|
Fix link
|
2018-02-21 16:59:59 +01:00 |
|
Michael RICOIS
|
870b8ab4d5
|
Change invite link
|
2018-02-21 16:53:15 +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
|
2a1c162040
|
Reload ajax page after submit
|
2018-02-20 15:46:42 +01:00 |
|
Michael RICOIS
|
f7a4656e9d
|
Update libs multiselect
|
2018-02-20 14:41:46 +01:00 |
|
David
|
eba305a933
|
Merge branch 'ticket-14436-excel-format'
|
2018-02-20 12:00:35 +01:00 |
|
David
|
0c1e1a7b21
|
git export management
|
2018-02-20 11:46:34 +01:00 |
|
David
|
7f8f72089a
|
Merge branch 'ticket-14436-excel-format'
|
2018-02-20 11:34:20 +01:00 |
|
Michael RICOIS
|
713c316914
|
Merge remote-tracking branch 'origin/ticket/r16108-test-sponsor'
|
2018-02-15 11:31:23 +01:00 |
|
Michael RICOIS
|
3b2bbeed4c
|
Merge remote-tracking branch 'origin/ticket/r15225-redirect-mobile'
|
2018-02-15 11:31:00 +01:00 |
|
Michael RICOIS
|
44e2c88319
|
rawurlencode
|
2018-02-15 11:27:33 +01:00 |
|
Michael RICOIS
|
ad9ad9d1f1
|
Update Itunes link
|
2018-02-15 10:34:47 +01:00 |
|
Michael RICOIS
|
12a9b24cad
|
Invert link app store
|
2018-02-15 10:25:29 +01:00 |
|
Michael RICOIS
|
d6107bf198
|
Remove <br>
|
2018-02-15 10:13:22 +01:00 |
|
David
|
88d1284171
|
Added new calculation for best sales
|
2018-02-14 18:53:23 +01:00 |
|
Michael RICOIS
|
c530d9324e
|
rawurlencode params
|
2018-02-14 17:07:37 +01:00 |
|
Michael RICOIS
|
1903c42573
|
Enable/Disable credit display
|
2018-02-14 14:54:13 +01:00 |
|
Michael RICOIS
|
7b734c9b60
|
Remove samrtbanner error
|
2018-02-14 12:46:25 +01:00 |
|
Michael RICOIS
|
8ff1af50df
|
Test
|
2018-02-14 12:16:16 +01:00 |
|
Michael RICOIS
|
a348fd8328
|
Exchange order pack first, single after
|
2018-02-14 09:36:36 +01:00 |
|
Michael RICOIS
|
bb7d8d133d
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-13 17:42:41 +01:00 |
|
Michael RICOIS
|
ee76fb5feb
|
Display action
|
2018-02-13 17:35:12 +01:00 |
|
Michael RICOIS
|
4e88bd364a
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-13 16:46:08 +01:00 |
|
Michael RICOIS
|
fb61d8b1ad
|
id_order
|
2018-02-13 16:45:38 +01:00 |
|