From c3f9addeca2f572114e1b83653d25dc3efa3cfdc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 19 Jul 2022 07:59:20 +1000 Subject: [PATCH 1/3] Update Stripe responses for redirect_status --- app/PaymentDrivers/Stripe/Alipay.php | 2 +- app/PaymentDrivers/Stripe/Bancontact.php | 2 +- app/PaymentDrivers/Stripe/EPS.php | 2 +- app/PaymentDrivers/Stripe/FPX.php | 2 +- app/PaymentDrivers/Stripe/GIROPAY.php | 2 +- app/PaymentDrivers/Stripe/PRZELEWY24.php | 2 +- app/PaymentDrivers/Stripe/SOFORT.php | 3 ++- app/PaymentDrivers/Stripe/iDeal.php | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/PaymentDrivers/Stripe/Alipay.php b/app/PaymentDrivers/Stripe/Alipay.php index 3c18cb9bc9c5..5fee7aeac458 100644 --- a/app/PaymentDrivers/Stripe/Alipay.php +++ b/app/PaymentDrivers/Stripe/Alipay.php @@ -59,7 +59,7 @@ class Alipay $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded', 'pending'])) { return $this->processSuccesfulRedirect($request->source); } diff --git a/app/PaymentDrivers/Stripe/Bancontact.php b/app/PaymentDrivers/Stripe/Bancontact.php index 6e4a640678d3..fcc257d9bf5f 100644 --- a/app/PaymentDrivers/Stripe/Bancontact.php +++ b/app/PaymentDrivers/Stripe/Bancontact.php @@ -81,7 +81,7 @@ class Bancontact $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded','pending'])) { return $this->processSuccessfulPayment($request->payment_intent); } diff --git a/app/PaymentDrivers/Stripe/EPS.php b/app/PaymentDrivers/Stripe/EPS.php index baaf8f180763..677397b21593 100644 --- a/app/PaymentDrivers/Stripe/EPS.php +++ b/app/PaymentDrivers/Stripe/EPS.php @@ -80,7 +80,7 @@ class EPS $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded','pending'])) { return $this->processSuccessfulPayment($request->payment_intent); } diff --git a/app/PaymentDrivers/Stripe/FPX.php b/app/PaymentDrivers/Stripe/FPX.php index f669de5c3646..dd415ea39808 100644 --- a/app/PaymentDrivers/Stripe/FPX.php +++ b/app/PaymentDrivers/Stripe/FPX.php @@ -81,7 +81,7 @@ class FPX $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded','pending'])) { return $this->processSuccessfulPayment($request->payment_intent); } diff --git a/app/PaymentDrivers/Stripe/GIROPAY.php b/app/PaymentDrivers/Stripe/GIROPAY.php index 0457a9b6de4d..5dfc098f5446 100644 --- a/app/PaymentDrivers/Stripe/GIROPAY.php +++ b/app/PaymentDrivers/Stripe/GIROPAY.php @@ -80,7 +80,7 @@ class GIROPAY $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded','pending'])) { return $this->processSuccessfulPayment($request->payment_intent); } diff --git a/app/PaymentDrivers/Stripe/PRZELEWY24.php b/app/PaymentDrivers/Stripe/PRZELEWY24.php index 6e497bb98bff..871a1697c924 100644 --- a/app/PaymentDrivers/Stripe/PRZELEWY24.php +++ b/app/PaymentDrivers/Stripe/PRZELEWY24.php @@ -80,7 +80,7 @@ class PRZELEWY24 $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded','pending'])) { return $this->processSuccessfulPayment($request->payment_intent); } diff --git a/app/PaymentDrivers/Stripe/SOFORT.php b/app/PaymentDrivers/Stripe/SOFORT.php index b40f216c8d42..aed9f5a91e94 100644 --- a/app/PaymentDrivers/Stripe/SOFORT.php +++ b/app/PaymentDrivers/Stripe/SOFORT.php @@ -77,10 +77,11 @@ class SOFORT public function paymentResponse($request) { + $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded','pending'])) { return $this->processSuccessfulPayment($request->payment_intent); } diff --git a/app/PaymentDrivers/Stripe/iDeal.php b/app/PaymentDrivers/Stripe/iDeal.php index 1009f9a0c2ea..eecd2ce60aac 100644 --- a/app/PaymentDrivers/Stripe/iDeal.php +++ b/app/PaymentDrivers/Stripe/iDeal.php @@ -80,7 +80,7 @@ class iDeal $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $request->all()); $this->stripe->payment_hash->save(); - if ($request->redirect_status == 'succeeded') { + if (in_array($request->redirect_status, ['succeeded','pending'])) { return $this->processSuccessfulPayment($request->payment_intent); } From 852fe26cc1d1477f02eb21d72f5024c64ebae36f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 19 Jul 2022 08:34:39 +1000 Subject: [PATCH 2/3] minor fixes for stripe --- app/Http/Controllers/StripeConnectController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php index faafe25feeba..e9547414404c 100644 --- a/app/Http/Controllers/StripeConnectController.php +++ b/app/Http/Controllers/StripeConnectController.php @@ -120,7 +120,7 @@ class StripeConnectController extends BaseController $company_gateway->setConfig($payload); $company_gateway->save(); - StripeWebhook::dispatch($company->company_key, $company_gateway->id); + // StripeWebhook::dispatch($company->company_key, $company_gateway->id); //response here return view('auth.connect.completed'); From c1352e700da9252a53d2e4bf1386b3ebcd1057b3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 19 Jul 2022 09:39:54 +1000 Subject: [PATCH 3/3] Fixes for purging company data --- app/Http/Controllers/MigrationController.php | 2 ++ app/Http/Requests/Company/StoreCompanyRequest.php | 4 ---- app/Jobs/Company/CompanyImport.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 2edaf042b933..c50868b85c42 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -179,6 +179,7 @@ class MigrationController extends BaseController $company->tasks()->forceDelete(); $company->vendors()->forceDelete(); $company->expenses()->forceDelete(); + $company->purchase_orders()->forceDelete(); $settings = $company->settings; @@ -196,6 +197,7 @@ class MigrationController extends BaseController $settings->ticket_number_counter = 1; $settings->payment_number_counter = 1; $settings->project_number_counter = 1; + $settings->purchase_order_number_counter = 1; $company->settings = $settings; diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php index 0b8d72c69e70..684dca281740 100644 --- a/app/Http/Requests/Company/StoreCompanyRequest.php +++ b/app/Http/Requests/Company/StoreCompanyRequest.php @@ -63,10 +63,6 @@ class StoreCompanyRequest extends Request { $input = $this->all(); - //https not sure i should be forcing this. - // if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) - // $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']); - if (array_key_exists('google_analytics_url', $input)) { $input['google_analytics_key'] = $input['google_analytics_url']; } diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 4977b11368a6..6ce29bbaaf24 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -458,7 +458,7 @@ class CompanyImport implements ShouldQueue $settings->ticket_number_counter = 1; $settings->payment_number_counter = 1; $settings->project_number_counter = 1; - $settings->purchase_order_counter = 1; + $settings->purchase_order_number_counter = 1; $this->company->settings = $co->settings; // $this->company->settings = $this->backup_file->company->settings; $this->company->save();