Payment modules

[martynas-wm]

Added PayPal Express Checkout, PayPal PayFlow Iframe, PayPal Payments Pro Iframe and Amazon Payments

[opencart]

are you really, really sure this all works?

On Tue, Jul 23, 2013 at 9:26 PM, Martynas Puronas
notifications@github.comwrote:

Added PayPal Express Checkout, PayPal PayFlow Iframe, PayPal Payments Pro

Iframe and Amazon Payments

You can merge this Pull Request by running

git pull https://github.com/welfordmedia/opencart v1.5.5.1

Or view, comment on, or merge it at:

#790
Commit Summary

• Added PayPal Express Checkout, PayPal PayFlow Iframe, PayPal
  Payments Pro Iframe, Amazon Payments.

File Changes

• M upload/admin/controller/catalog/product.phphttps://github.com/Payment modules #790/files#diff-0(2833)
• A upload/admin/controller/catalog/profile.phphttps://github.com/Payment modules #790/files#diff-1(394)
• M upload/admin/controller/common/header.phphttps://github.com/Payment modules #790/files#diff-2(24)
• A upload/admin/controller/module/amazon_checkout_layout.phphttps://github.com/Payment modules #790/files#diff-3(101)
• A upload/admin/controller/module/pp_layout.phphttps://github.com/Payment modules #790/files#diff-4(101)
• A upload/admin/controller/payment/amazon_checkout.phphttps://github.com/Payment modules #790/files#diff-5(464)
• A upload/admin/controller/payment/pp_express.phphttps://github.com/Payment modules #790/files#diff-6(1184)
• A upload/admin/controller/payment/pp_payflow_iframe.phphttps://github.com/Payment modules #790/files#diff-7(574)
• A upload/admin/controller/payment/pp_pro_iframe.phphttps://github.com/Payment modules #790/files#diff-8(964)
• A upload/admin/controller/payment/pp_pro_pf.phphttps://github.com/Payment modules #790/files#diff-9(212)
• M upload/admin/controller/payment/pp_pro_uk.phphttps://github.com/Payment modules #790/files#diff-10(403)
• M upload/admin/controller/payment/pp_standard.phphttps://github.com/Payment modules #790/files#diff-11(456)
• M upload/admin/controller/sale/order.phphttps://github.com/Payment modules #790/files#diff-12(5120)
• A upload/admin/controller/sale/recurring.phphttps://github.com/Payment modules #790/files#diff-13(485)
• M upload/admin/language/english/catalog/product.phphttps://github.com/Payment modules #790/files#diff-14(185)
• A upload/admin/language/english/catalog/profile.phphttps://github.com/Payment modules #790/files#diff-15(45)
• M upload/admin/language/english/common/header.phphttps://github.com/Payment modules #790/files#diff-16(173)
• M upload/admin/language/english/english.phphttps://github.com/Payment modules #790/files#diff-17(235)
• A upload/admin/language/english/module/amazon_checkout_layout.phphttps://github.com/Payment modules #790/files#diff-18(17)
• A upload/admin/language/english/module/pp_layout.phphttps://github.com/Payment modules #790/files#diff-19(18)
• A upload/admin/language/english/payment/amazon_checkout.phphttps://github.com/Payment modules #790/files#diff-20(82)
• M upload/admin/language/english/payment/pp_express.phphttps://github.com/Payment modules #790/files#diff-21(93)
• A upload/admin/language/english/payment/pp_express_order.phphttps://github.com/Payment modules #790/files#diff-22(27)
• A upload/admin/language/english/payment/pp_express_refund.phphttps://github.com/Payment modules #790/files#diff-23(16)
• A upload/admin/language/english/payment/pp_express_search.phphttps://github.com/Payment modules #790/files#diff-24(72)
• A upload/admin/language/english/payment/pp_express_view.phphttps://github.com/Payment modules #790/files#diff-25(83)
• A upload/admin/language/english/payment/pp_payflow_iframe.phphttps://github.com/Payment modules #790/files#diff-26(95)
• A upload/admin/language/english/payment/pp_pro_iframe.phphttps://github.com/Payment modules #790/files#diff-27(175)
• A upload/admin/language/english/payment/pp_pro_pf.phphttps://github.com/Payment modules #790/files#diff-28(31)
• M upload/admin/language/english/payment/pp_pro_uk.phphttps://github.com/Payment modules #790/files#diff-29(58)
• M upload/admin/language/english/payment/pp_standard.phphttps://github.com/Payment modules #790/files#diff-30(68)
• A upload/admin/language/english/sale/recurring.phphttps://github.com/Payment modules #790/files#diff-31(51)
• M upload/admin/model/catalog/product.phphttps://github.com/Payment modules #790/files#diff-32(1353)
• A upload/admin/model/catalog/profile.phphttps://github.com/Payment modules #790/files#diff-33(83)
• A upload/admin/model/payment/amazon_checkout.phphttps://github.com/Payment modules #790/files#diff-34(103)
• A upload/admin/model/payment/pp_express.phphttps://github.com/Payment modules #790/files#diff-35(289)
• A upload/admin/model/payment/pp_payflow_iframe.phphttps://github.com/Payment modules #790/files#diff-36(139)
• A upload/admin/model/payment/pp_pro_iframe.phphttps://github.com/Payment modules #790/files#diff-37(263)
• M upload/admin/model/sale/order.phphttps://github.com/Payment modules #790/files#diff-38(1550)
• A upload/admin/model/sale/recurring.phphttps://github.com/Payment modules #790/files#diff-39(244)
• A upload/admin/view/image/payment/amazon.pnghttps://github.com/Payment modules #790/files#diff-40(0)
• M upload/admin/view/template/catalog/product_form.tplhttps://github.com/Payment modules #790/files#diff-41(2610)
• A upload/admin/view/template/catalog/profile_form.tplhttps://github.com/Payment modules #790/files#diff-42(184)
• A upload/admin/view/template/catalog/profile_list.tplhttps://github.com/Payment modules #790/files#diff-43(56)
• M upload/admin/view/template/common/header.tplhttps://github.com/Payment modules #790/files#diff-44(440)
• A upload/admin/view/template/module/amazon_checkout_layout.tplhttps://github.com/Payment modules #790/files#diff-45(120)
• A upload/admin/view/template/module/pp_layout.tplhttps://github.com/Payment modules #790/files#diff-46(120)
• A upload/admin/view/template/payment/amazon_checkout.tplhttps://github.com/Payment modules #790/files#diff-47(280)
• A upload/admin/view/template/payment/amazon_checkout_order.tplhttps://github.com/Payment modules #790/files#diff-48(101)
• A upload/admin/view/template/payment/debug.loghttps://github.com/Payment modules #790/files#diff-49(19)
• M upload/admin/view/template/payment/pp_express.tplhttps://github.com/Payment modules #790/files#diff-50(512)
• A upload/admin/view/template/payment/pp_express_order.tplhttps://github.com/Payment modules #790/files#diff-51(236)
• A upload/admin/view/template/payment/pp_express_refund.tplhttps://github.com/Payment modules #790/files#diff-52(66)
• A upload/admin/view/template/payment/pp_express_search.tplhttps://github.com/Payment modules #790/files#diff-53(216)
• A upload/admin/view/template/payment/pp_express_view.tplhttps://github.com/Payment modules #790/files#diff-54(540)
• A upload/admin/view/template/payment/pp_payflow_iframe.tplhttps://github.com/Payment modules #790/files#diff-55(185)
• A upload/admin/view/template/payment/pp_payflow_iframe_order.tplhttps://github.com/Payment modules #790/files#diff-56(170)
• A upload/admin/view/template/payment/pp_payflow_iframe_refund.tplhttps://github.com/Payment modules #790/files#diff-57(67)
• A upload/admin/view/template/payment/pp_pro_iframe.tplhttps://github.com/Payment modules #790/files#diff-58(306)
• A upload/admin/view/template/payment/pp_pro_iframe_order.tplhttps://github.com/Payment modules #790/files#diff-59(285)
• A upload/admin/view/template/payment/pp_pro_iframe_refund.tplhttps://github.com/Payment modules #790/files#diff-60(70)
• A upload/admin/view/template/payment/pp_pro_iframe_transaction.tplhttps://github.com/Payment modules #790/files#diff-61(491)
• A upload/admin/view/template/payment/pp_pro_pf.tplhttps://github.com/Payment modules #790/files#diff-62(126)
• M upload/admin/view/template/payment/pp_pro_uk.tplhttps://github.com/Payment modules #790/files#diff-63(243)
• M upload/admin/view/template/payment/pp_standard.tplhttps://github.com/Payment modules #790/files#diff-64(448)
• M upload/admin/view/template/sale/order_info.tplhttps://github.com/Payment modules #790/files#diff-65(1889)
• A upload/admin/view/template/sale/recurring_info.tplhttps://github.com/Payment modules #790/files#diff-66(116)
• A upload/admin/view/template/sale/recurring_list.tplhttps://github.com/Payment modules #790/files#diff-67(169)
• M upload/catalog/controller/account/account.phphttps://github.com/Payment modules #790/files#diff-68(172)
• A upload/catalog/controller/account/recurring.phphttps://github.com/Payment modules #790/files#diff-69(271)
• M upload/catalog/controller/checkout/cart.phphttps://github.com/Payment modules #790/files#diff-70(1553)
• M upload/catalog/controller/checkout/checkout.phphttps://github.com/Payment modules #790/files#diff-71(220)
• M upload/catalog/controller/checkout/confirm.phphttps://github.com/Payment modules #790/files#diff-72(825)
• M upload/catalog/controller/checkout/payment_method.phphttps://github.com/Payment modules #790/files#diff-73(404)
• M upload/catalog/controller/common/header.phphttps://github.com/Payment modules #790/files#diff-74(10)
• M upload/catalog/controller/module/account.phphttps://github.com/Payment modules #790/files#diff-75(2)
• A upload/catalog/controller/module/amazon_checkout_layout.phphttps://github.com/Payment modules #790/files#diff-76(43)
• M upload/catalog/controller/module/cart.phphttps://github.com/Payment modules #790/files#diff-77(283)
• A upload/catalog/controller/module/pp_layout.phphttps://github.com/Payment modules #790/files#diff-78(35)
• A upload/catalog/controller/payment/amazon_checkout.phphttps://github.com/Payment modules #790/files#diff-79(871)
• M upload/catalog/controller/payment/pp_express.phphttps://github.com/Payment modules #790/files#diff-80(2005)
• A upload/catalog/controller/payment/pp_payflow_iframe.phphttps://github.com/Payment modules #790/files#diff-81(177)
• A upload/catalog/controller/payment/pp_pro_iframe.phphttps://github.com/Payment modules #790/files#diff-82(309)
• A upload/catalog/controller/payment/pp_pro_pf.phphttps://github.com/Payment modules #790/files#diff-83(199)
• M upload/catalog/controller/payment/pp_pro_uk.phphttps://github.com/Payment modules #790/files#diff-84(400)
• M upload/catalog/controller/payment/pp_standard.phphttps://github.com/Payment modules #790/files#diff-85(400)
• M upload/catalog/controller/product/product.phphttps://github.com/Payment modules #790/files#diff-86(1479)
• M upload/catalog/language/english/account/account.phphttps://github.com/Payment modules #790/files#diff-87(2)
• A upload/catalog/language/english/account/recurring.phphttps://github.com/Payment modules #790/files#diff-88(54)
• M upload/catalog/language/english/checkout/cart.phphttps://github.com/Payment modules #790/files#diff-89(126)
• M upload/catalog/language/english/checkout/checkout.phphttps://github.com/Payment modules #790/files#diff-90(187)
• M upload/catalog/language/english/module/account.phphttps://github.com/Payment modules #790/files#diff-91(1)
• M upload/catalog/language/english/module/cart.phphttps://github.com/Payment modules #790/files#diff-92(20)
• A upload/catalog/language/english/payment/amazon_checkout.phphttps://github.com/Payment modules #790/files#diff-93(24)
• M upload/catalog/language/english/payment/pp_express.phphttps://github.com/Payment modules #790/files#diff-94(24)
• A upload/catalog/language/english/payment/pp_payflow_iframe.phphttps://github.com/Payment modules #790/files#diff-95(7)
• A upload/catalog/language/english/payment/pp_pro_iframe.phphttps://github.com/Payment modules #790/files#diff-96(7)
• A upload/catalog/language/english/payment/pp_pro_pf.phphttps://github.com/Payment modules #790/files#diff-97(25)
• M upload/catalog/language/english/payment/pp_pro_uk.phphttps://github.com/Payment modules #790/files#diff-98(39)
• M upload/catalog/language/english/payment/pp_standard.phphttps://github.com/Payment modules #790/files#diff-99(12)
• M upload/catalog/language/english/product/product.phphttps://github.com/Payment modules #790/files#diff-100(112)
• A upload/catalog/model/account/recurring.phphttps://github.com/Payment modules #790/files#diff-101(98)
• M upload/catalog/model/catalog/product.phphttps://github.com/Payment modules #790/files#diff-102(1213)
• M upload/catalog/model/checkout/order.phphttps://github.com/Payment modules #790/files#diff-103(1348)
• A upload/catalog/model/checkout/recurring.phphttps://github.com/Payment modules #790/files#diff-104(20)
• A upload/catalog/model/payment/amazon_checkout.phphttps://github.com/Payment modules #790/files#diff-105(55)
• M upload/catalog/model/payment/pp_express.phphttps://github.com/Payment modules #790/files#diff-106(387)
• A upload/catalog/model/payment/pp_payflow_iframe.phphttps://github.com/Payment modules #790/files#diff-107(122)
• A upload/catalog/model/payment/pp_pro_iframe.phphttps://github.com/Payment modules #790/files#diff-108(48)
• A upload/catalog/model/payment/pp_pro_pf.phphttps://github.com/Payment modules #790/files#diff-109(31)
• M upload/catalog/model/payment/pp_pro_uk.phphttps://github.com/Payment modules #790/files#diff-110(56)
• M upload/catalog/model/payment/pp_standard.phphttps://github.com/Payment modules #790/files#diff-111(122)
• A upload/catalog/view/theme/default/image/paypal_express_mobile.pnghttps://github.com/Payment modules #790/files#diff-112(0)
• M upload/catalog/view/theme/default/template/account/account.tplhttps://github.com/Payment modules #790/files#diff-113(81)
• A
  upload/catalog/view/theme/default/template/account/recurring_info.tplhttps://github.com/Payment modules #790/files#diff-114(100)
• A
  upload/catalog/view/theme/default/template/account/recurring_list.tplhttps://github.com/Payment modules #790/files#diff-115(48)
• M upload/catalog/view/theme/default/template/checkout/cart.tplhttps://github.com/Payment modules #790/files#diff-116(709)
• M upload/catalog/view/theme/default/template/checkout/checkout.tplhttps://github.com/Payment modules #790/files#diff-117(1898)
• M upload/catalog/view/theme/default/template/checkout/confirm.tplhttps://github.com/Payment modules #790/files#diff-118(115)
• M upload/catalog/view/theme/default/template/common/header.tplhttps://github.com/Payment modules #790/files#diff-119(5)
• M upload/catalog/view/theme/default/template/module/account.tplhttps://github.com/Payment modules #790/files#diff-120(53)
• A
  upload/catalog/view/theme/default/template/module/amazon_checkout_layout.tplhttps://github.com/Payment modules #790/files#diff-121(30)
• M upload/catalog/view/theme/default/template/module/cart.tplhttps://github.com/Payment modules #790/files#diff-122(103)
• A upload/catalog/view/theme/default/template/module/pp_layout.tplhttps://github.com/Payment modules #790/files#diff-123(7)
• A
  upload/catalog/view/theme/default/template/payment/amazon_checkout_address.tplhttps://github.com/Payment modules #790/files#diff-124(95)
• A
  upload/catalog/view/theme/default/template/payment/amazon_checkout_cart.tplhttps://github.com/Payment modules #790/files#diff-125(23)
• A
  upload/catalog/view/theme/default/template/payment/amazon_checkout_confirm.tplhttps://github.com/Payment modules #790/files#diff-126(76)
• A
  upload/catalog/view/theme/default/template/payment/amazon_checkout_failure.tplhttps://github.com/Payment modules #790/files#diff-127(7)
• A
  upload/catalog/view/theme/default/template/payment/amazon_checkout_payment.tplhttps://github.com/Payment modules #790/files#diff-128(37)
• A
  upload/catalog/view/theme/default/template/payment/amazon_checkout_success.tplhttps://github.com/Payment modules #790/files#diff-129(14)
• M upload/catalog/view/theme/default/template/payment/pp_express.tplhttps://github.com/Payment modules #790/files#diff-130(5)
• A
  upload/catalog/view/theme/default/template/payment/pp_express_confirm.tplhttps://github.com/Payment modules #790/files#diff-131(208)
• A
  upload/catalog/view/theme/default/template/payment/pp_payflow_iframe.tplhttps://github.com/Payment modules #790/files#diff-132(11)
• A
  upload/catalog/view/theme/default/template/payment/pp_payflow_iframe_cancel.tplhttps://github.com/Payment modules #790/files#diff-133(3)
• A
  upload/catalog/view/theme/default/template/payment/pp_payflow_iframe_error.tplhttps://github.com/Payment modules #790/files#diff-134(3)
• A
  upload/catalog/view/theme/default/template/payment/pp_payflow_iframe_return.tplhttps://github.com/Payment modules #790/files#diff-135(3)
• A
  upload/catalog/view/theme/default/template/payment/pp_pro_iframe.tplhttps://github.com/Payment modules #790/files#diff-136(18)
• A
  upload/catalog/view/theme/default/template/payment/pp_pro_iframe_body.tplhttps://github.com/Payment modules #790/files#diff-137(24)
• A upload/catalog/view/theme/default/template/payment/pp_pro_pf.tplhttps://github.com/Payment modules #790/files#diff-138(91)
• M upload/catalog/view/theme/default/template/payment/pp_pro_uk.tplhttps://github.com/Payment modules #790/files#diff-139(178)
• M
  upload/catalog/view/theme/default/template/payment/pp_standard.tplhttps://github.com/Payment modules #790/files#diff-140(103)
• M upload/catalog/view/theme/default/template/product/product.tplhttps://github.com/Payment modules #790/files#diff-141(987)
• A upload/cba_cron.phphttps://github.com/Payment modules #790/files#diff-142(36)
• M upload/install/opencart.sqlhttps://github.com/Payment modules #790/files#diff-143(15054)
• A upload/system/AmazonOrderAdjustmentTemplate.xlshttps://github.com/Payment modules #790/files#diff-144(0)
• M upload/system/engine/controller.phphttps://github.com/Payment modules #790/files#diff-145(169)
• M upload/system/library/cart.phphttps://github.com/Payment modules #790/files#diff-146(878)
• A upload/system/library/cba.phphttps://github.com/Payment modules #790/files#diff-147(566)

Patch Links:

• https://github.com/opencart/opencart/pull/790.patch
• https://github.com/opencart/opencart/pull/790.diff

[ghost]

great commit

[ADDCreative]

Was it wise to commit to the 1.5.5.1 branch which changes the download on the main site? http://www.opencart.com/index.php?route=download/download

[DS-Matt]

ADDCreative is right, not only does it change the V1.5.5.1 code, it also hasn't been added to the OC 2.0 master branch code.

[opencart]

yes it will be added after
i don;t have time to merge it with the mast branch. the master branch is still another month away. its been over 7 months since the last release.

[opencart]

i have had to release this as both paypa and amazon have paid to add these extensions.

[JAY6390]

Why hasn't the version number been altered? This is ridiculous

[uksitebuilder]

Awesome - Can just see the support requests and refund requests for extensions that were compatible with 1.5.5.1 now not being compatible due to the changed files.

Should have at least been versioned to 1.5.5.1.1 if not 1.5.5.2

[ghost]

I'd vote for 1.5.6 but it's hard to tell exactly what was changed from the commit.