From 772fb073dd0c1c465c5f8d58a1275efd2b076b90 Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Thu, 7 Dec 2017 14:51:23 +0800
Subject: [PATCH] =?UTF-8?q?paypal=E6=94=AF=E4=BB=98=EF=BC=8C=E4=BD=BF?=
=?UTF-8?q?=E7=94=A8paypal=E7=BB=91=E5=AE=9A=E7=9A=84=E4=BF=A1=E7=94=A8?=
=?UTF-8?q?=E5=8D=A1=EF=BC=8C=E8=80=8C=E9=9D=9Epaypal=E4=BD=99=E9=A2=9D?=
=?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5?=
=?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=90=AB=E4=B9=89?=
=?UTF-8?q?=EF=BC=8Cprprocessing=E4=BB=A3=E8=A1=A8=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=A4=84=E7=90=86=E4=B8=AD=EF=BC=8Cconfirmed?=
=?UTF-8?q?=E4=BB=A3=E8=A1=A8=E8=AE=A2=E5=8D=95=E5=B7=B2=E6=94=B6=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../default/sales/orderinfo/manageredit.php | 2 +-
.../controllers/paypal/ExpressController.php | 4 +-
.../controllers/paypal/StandardController.php | 4 +-
.../controllers/paypal/ExpressController.php | 4 +-
.../controllers/paypal/StandardController.php | 4 +-
.../controllers/paypal/ExpressController.php | 2 +-
.../controllers/paypal/StandardController.php | 2 +-
services/Order.php | 8 +
services/Payment.php | 4 +-
services/payment/Paypal.php | 207 +++++++++++++-----
10 files changed, 179 insertions(+), 62 deletions(-)
diff --git a/app/appadmin/theme/base/default/sales/orderinfo/manageredit.php b/app/appadmin/theme/base/default/sales/orderinfo/manageredit.php
index d6781a9b..9b81a3b8 100644
--- a/app/appadmin/theme/base/default/sales/orderinfo/manageredit.php
+++ b/app/appadmin/theme/base/default/sales/orderinfo/manageredit.php
@@ -285,7 +285,7 @@ use fecshop\app\appfront\helper\Format;