Commit Graph

36 Commits

Author SHA1 Message Date
Marion Muszynski
fde48c205b Merge branch 'feature/api_return_url_paypal' into develop 2017-11-15 11:44:31 +01:00
Christophe LATOUR
83daadd46b Adding param to return paypal url instead of redirecting user 2017-11-14 19:50:57 +01:00
Marion Muszynski
0b78ebc2f3 Merge branch 'Task-Caching' into develop 2017-10-30 13:42:08 +01:00
root
690a60f4ad fix from prod for payment modules 2017-10-30 11:34:13 +01:00
Marion Muszynski
59f5489410 Merge branch 'ticket-14301-ErrorApiPaypal' into develop 2017-09-27 16:00:24 +02:00
Marion Muszynski
695cd7740c fix direct payment paypal 2017-09-27 16:00:08 +02:00
Marion Muszynski
72f4b5f05a fix conflicts 2017-09-27 12:04:46 +02:00
Marion Muszynski
1caec538ac fix paypal api errors 2017-09-27 12:03:07 +02:00
Marion Muszynski
379bec4ab4 Merge branch 'task-imgForMobile' into develop 2017-09-01 12:00:07 +02:00
root
61ed06dc22 Revert "Revert "fix from prod""
This reverts commit 38a13c74d6.
2017-09-01 11:22:11 +02:00
root
38a13c74d6 Revert "fix from prod"
This reverts commit cd44650b28.
2017-09-01 11:16:02 +02:00
root
cd44650b28 fix from prod 2017-09-01 11:06:24 +02:00
Marion Muszynski
45fbaac030 Merge branch 'ticket-13166-RetourProcess_3' into develop 2017-06-26 11:53:16 +02:00
Marion Muszynski
a2a0385822 upgrading of return process 2017-06-26 11:52:56 +02:00
Marion Muszynski
3f775a0fec Merge branch 'ticket-paypalError' into develop 2017-06-15 16:19:42 +02:00
Marion Muszynski
9e79b4dfc4 fix error when amount is 0 2017-06-15 16:19:26 +02:00
Marion Muszynski
f95fc836e5 Merge branch 'ticket-11208-FactureCadeau' into develop 2016-12-02 10:16:13 +01:00
Marion Muszynski
ed6002b84b gift management 2016-12-02 10:15:51 +01:00
Marion Muszynski
607d4d0628 Merge branch 'fix-paypal' into develop 2016-10-18 13:11:54 +02:00
Marion Muszynski
3b2eec3adc fix 2016-10-18 13:11:32 +02:00
Marion Muszynski
d9c8a37f64 fix conflict 2016-10-18 13:00:30 +02:00
Marion Muszynski
55129786ec open paypal account 2016-10-18 12:59:37 +02:00
Marion Muszynski
1f5d683f4b fix conflict 2016-10-18 12:58:26 +02:00
Marion Muszynski
9aac4ea22a comment address creation and recuperation address info after doExpressCheckout 2016-10-18 12:54:53 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
1e7243c023 checking orders addition 2016-09-09 17:19:12 +02:00
Marion Muszynski
e9ea05d32b addition of delivery address checking 2016-09-08 18:08:21 +02:00
Rodney Figaro
33c5572c08 apply the same confirmation order page to all type of paypal paiements 2016-08-24 17:24:41 +02:00
Thibault UBUNTU
25bf39f711 trad es 2016-05-03 12:08:55 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Thibault UBUNTU
3e3d3a0e58 fix paypal order save 2016-04-06 16:32:50 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Thibault UBUNTU
39f9ff27e5 skin page payment 2016-04-04 13:24:07 +02:00
Srv Bebeboutik
84b337ab99 add logo to payment page paypal 2016-03-24 10:29:55 +01:00
Srv Bebeboutik
95ce768657 retire restriction paypal refund 2016-02-05 12:25:42 +01:00
Srv Bebeboutik
6c0978166c add modules 2016-01-04 12:49:26 +01:00