diff --git a/CHANGELOG.md b/CHANGELOG.md index 46d012b8..3fbaba67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Catch possible thrown Error by getting DataClientToken - [0007719](https://bugs.oxid-esales.com/view.php?id=7719): Tracking code also be stored in standard DB field for backwards compatibility +- add possibility to ignore cached tokens. It helps e.g. for webhook registration +- use PayPal-Client v2.0.17 +- [0007744](https://bugs.oxid-esales.com/view.php?id=7744): When using vouchers shop jumps back to payment selection +- [0007745](https://bugs.oxid-esales.com/view.php?id=7745): Paypal checkout jumps back to step 2 with an error when an discount in relation to item value is used +- [0007742](https://bugs.oxid-esales.com/view.php?id=7742): You get stuck in the checkout if the "Save payment method" option is activated for credit card payment + +### NEW + +- Custom id passed to PayPal as JSON with additional versioning data ## [2.5.1] - 2024-09-20 @@ -43,7 +52,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [0007675](https://bugs.oxid-esales.com/view.php?id=7675): fix the possibility to finish order without redirect and login to Paypal - [0007676](https://bugs.oxid-esales.com/view.php?id=7676): If we have a corrupted generated_services.yaml and try to deactivate the module via the admin, we will display a more understandable error message about what happened. - introduce ActionHash to make the PayPal-Request-ID more unique -- [0007695](https://bugs.oxid-esales.com/view.php?id=7695): Fix: if DeliverySet is set in Frontend, then do not add any PseudoDeliveryCosts for PPExpress ### NEW - PayPal-Request-Id based on serialized body, no extra PayPal-Request-Id necessary anymore diff --git a/LATEST_CLIENT_TAG b/LATEST_CLIENT_TAG index 3a3b26ea..e97b65ed 100644 --- a/LATEST_CLIENT_TAG +++ b/LATEST_CLIENT_TAG @@ -1 +1 @@ -v2.0.16 \ No newline at end of file +v2.0.17 \ No newline at end of file diff --git a/composer.json b/composer.json index 4572713c..4a272022 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "giggsey/libphonenumber-for-php": "^8.12", "viison/address-splitter": "^0.3.4", "webmozart/path-util": "^2.3.0", - "oxid-solution-catalysts/paypal-client": "v2.0.16" + "oxid-solution-catalysts/paypal-client": "v2.0.17" }, "require-dev": { "codeception/module-rest": "^1.4.2", diff --git a/metadata.php b/metadata.php index 437c1bfb..f071ae3d 100755 --- a/metadata.php +++ b/metadata.php @@ -61,7 +61,7 @@ 'en' => 'Use of the online payment service from PayPal. Documentation: PayPal Checkout' ], 'thumbnail' => 'out/img/paypal.png', - 'version' => '2.5.2-rc.1', + 'version' => '2.5.2-rc.2', 'author' => 'OXID eSales AG', 'url' => 'https://www.oxid-esales.com', 'email' => 'info@oxid-esales.com', @@ -570,5 +570,11 @@ 'value' => 3.5, 'group' => null ], + [ + 'name' => 'oscPayPalUseStructuralCustomIdSchema', + 'type' => 'bool', + 'value' => false, + 'group' => null + ], ], ]; diff --git a/src/Controller/Admin/PayPalConfigController.php b/src/Controller/Admin/PayPalConfigController.php index dfaf5cf3..6c6dd03e 100644 --- a/src/Controller/Admin/PayPalConfigController.php +++ b/src/Controller/Admin/PayPalConfigController.php @@ -287,6 +287,9 @@ protected function handleSpecialFields(array $conf): array $dAmount = (string) str_replace(',', '.', $conf['oscPayPalDefaultShippingPriceExpress']); $conf['oscPayPalDefaultShippingPriceExpress'] = $dAmount; } + if (!isset($conf['oscPayPalUseStructuralCustomIdSchema'])) { + $conf['oscPayPalUseStructuralCustomIdSchema'] = false; + } return $conf; } diff --git a/src/Core/Config.php b/src/Core/Config.php index 612159ee..e6ddd228 100755 --- a/src/Core/Config.php +++ b/src/Core/Config.php @@ -343,6 +343,11 @@ public function getStartTimeCleanUpOrders(): int return $this->getServiceFromContainer(ModuleSettings::class)->getStartTimeCleanUpOrders(); } + public function isCustomIdSchemaStructural(): bool + { + return $this->getServiceFromContainer(ModuleSettings::class)->isCustomIdSchemaStructural(); + } + public function tableExists(string $tableName = ''): bool { $exists = false; diff --git a/src/Core/Onboarding/Webhook.php b/src/Core/Onboarding/Webhook.php index b56cee55..b6738a44 100644 --- a/src/Core/Onboarding/Webhook.php +++ b/src/Core/Onboarding/Webhook.php @@ -16,6 +16,7 @@ use OxidSolutionCatalysts\PayPal\Exception\OnboardingException; use OxidSolutionCatalysts\PayPal\Service\ModuleSettings; use OxidSolutionCatalysts\PayPal\Traits\ServiceContainer; +use OxidSolutionCatalysts\PayPalApi\Exception\ApiException; use OxidSolutionCatalysts\PayPalApi\Service\GenericService; class Webhook @@ -119,7 +120,11 @@ public function getAllRegisteredWebhooks(): array { /** @var GenericService $notificationService */ $webhookService = Registry::get(ServiceFactory::class)->getWebhookService(); - $result = $webhookService->request('GET'); + try { + $result = $webhookService->request('GET'); + } catch (ApiException $e) { + $result = []; + } return $result['webhooks'] ?? []; } diff --git a/src/Core/PatchRequestFactory.php b/src/Core/PatchRequestFactory.php index 3bdad79d..028d8949 100644 --- a/src/Core/PatchRequestFactory.php +++ b/src/Core/PatchRequestFactory.php @@ -67,50 +67,36 @@ public function getRequest( protected function getShippingAddressPatch(): void { - $addressObj = false; - $address = new AddressPortable(); - $session = Registry::getSession(); + $deliveryId = Registry::getSession()->getVariable("deladrid"); + $deliveryAddress = oxNew(Address::class); - $deliveryId = $session->getVariable("deladrid"); + if ($deliveryId && $deliveryAddress->load($deliveryId)) { + $patch = new Patch(); + $patch->op = Patch::OP_REPLACE; + $patch->path = "/purchase_units/@reference_id=='" + . Constants::PAYPAL_ORDER_REFERENCE_ID + . "'/shipping/address"; - if ($deliveryId) { - $deliveryAddress = oxNew(Address::class); - if ($deliveryAddress->load($deliveryId)) { - $addressObj = $deliveryAddress; - } - } - else { - $user = $this->basket->getUser(); - if ($user) { - $addressObj = $user; - } - } + $address = new AddressPortable(); - if ($addressObj) { $state = oxNew(State::class); - $country = oxNew(Country::class); + $state->load($deliveryAddress->getFieldData('oxstateid')); - $state->load($addressObj->getFieldData('oxstateid')); - $country->load($addressObj->getFieldData('oxcountryid')); + $country = oxNew(Country::class); + $country->load($deliveryAddress->getFieldData('oxcountryid')); $addressLine = - $addressObj->getFieldData('oxstreet') . " " . $addressObj->getFieldData('oxstreetnr'); + $deliveryAddress->getFieldData('oxstreet') . " " . $deliveryAddress->getFieldData('oxstreetnr'); $address->address_line_1 = $addressLine; - $addinfoLine = $addressObj->getFieldData('oxcompany') . " " . - $addressObj->getFieldData('oxaddinfo'); + $addinfoLine = $deliveryAddress->getFieldData('oxcompany') . " " . + $deliveryAddress->getFieldData('oxaddinfo'); $address->address_line_2 = $addinfoLine; $address->admin_area_1 = $state->getFieldData('oxtitle'); - $address->admin_area_2 = $addressObj->getFieldData('oxcity'); + $address->admin_area_2 = $deliveryAddress->getFieldData('oxcity'); $address->country_code = $country->oxcountry__oxisoalpha2->value; - $address->postal_code = $addressObj->getFieldData('oxzip'); - - $patch = new Patch(); - $patch->op = Patch::OP_REPLACE; - $patch->path = "/purchase_units/@reference_id=='" - . Constants::PAYPAL_ORDER_REFERENCE_ID - . "'/shipping/address"; + $address->postal_code = $deliveryAddress->getFieldData('oxzip'); $patch->value = $address; diff --git a/src/Core/PayPalRequestAmountFactory.php b/src/Core/PayPalRequestAmountFactory.php index 5894ab38..dac1ce34 100644 --- a/src/Core/PayPalRequestAmountFactory.php +++ b/src/Core/PayPalRequestAmountFactory.php @@ -47,18 +47,16 @@ public function getAmount(Basket $basket): AmountWithBreakdown } if ($netMode) { - $total = $brutBasketTotal - $shipping; + $total = $itemTotal - $shipping; } else { $total = $itemTotal - $discount + $itemTotalAdditionalCosts; } - $total_with_shipping = $total + $shipping; $total = PriceToMoney::convert($total, $currency); - $total_with_shipping = PriceToMoney::convert($total_with_shipping, $currency); //Total amount $amount = new AmountWithBreakdown(); - $amount->value = $total_with_shipping->value; + $amount->value = $brutBasketTotal; $amount->currency_code = $total->currency_code; //Cost breakdown @@ -68,7 +66,8 @@ public function getAmount(Basket $basket): AmountWithBreakdown $breakdown->discount = PriceToMoney::convert($netMode ? $brutDiscountValue : $discount, $currency); } - $breakdown->item_total = PriceToMoney::convert($total->value, $currency); + $breakDownItemTotal = $netMode ? $total->value : $itemTotal; + $breakdown->item_total = PriceToMoney::convert($breakDownItemTotal, $currency); //Item tax sum - we use 0% and calculate with brutto to avoid rounding errors $breakdown->tax_total = PriceToMoney::convert(0, $currency); diff --git a/src/Core/ServiceFactory.php b/src/Core/ServiceFactory.php index 36886880..8e26fb07 100644 --- a/src/Core/ServiceFactory.php +++ b/src/Core/ServiceFactory.php @@ -70,7 +70,7 @@ public function getWebhookService(string $uri = ''): GenericService { return oxNew( GenericService::class, - $this->getClient(), + $this->getClient(false), '/v1/notifications/webhooks' . $uri ); } @@ -125,7 +125,7 @@ public function getIdentityService(): IdentityService * * @return Client */ - private function getClient(): Client + private function getClient(bool $useToken = true): Client { if ($this->client === null) { /** @var Config $config */ @@ -142,12 +142,14 @@ private function getClient(): Client $paymentId = $session->getVariable('paymentid'); $actionHash = md5($sessionId . $basketId . $paymentId); + $sTokenCacheFileName = $useToken ? $config->getTokenCacheFileName() : ''; + $client = new Client( $logger, $config->isSandbox() ? Client::SANDBOX_URL : Client::PRODUCTION_URL, $config->getClientId(), $config->getClientSecret(), - $config->getTokenCacheFileName(), + $sTokenCacheFileName, $actionHash, // must be empty. We do not have the merchant's payerid //and confirmed by paypal we should not use it for auth and diff --git a/src/Model/Order.php b/src/Model/Order.php index 6be99c5f..49a43025 100644 --- a/src/Model/Order.php +++ b/src/Model/Order.php @@ -663,7 +663,6 @@ public function setPayPalTracking(string $trackingCarrier, string $trackingCode) 'oxtrackcode' => $trackingCode ] ); - $this->save(); $payPalOrder = $this->getPayPalRepository(); $payPalOrder->setTrackingCode($trackingCode); $payPalOrder->setTrackingCarrier($trackingCarrier); diff --git a/src/Service/ModuleSettings.php b/src/Service/ModuleSettings.php index e6317bdf..b2028b2f 100755 --- a/src/Service/ModuleSettings.php +++ b/src/Service/ModuleSettings.php @@ -624,11 +624,17 @@ public function getIsVaultingActive(): bool { return (bool)$this->getSettingValue('oscPayPalSetVaulting'); } + public function getIsGooglePayDeliveryAddressActive(): bool { return (bool)$this->getSettingValue('oscPayPalUseGooglePayAddress'); } + public function isCustomIdSchemaStructural(): bool + { + return (bool)$this->getSettingValue('oscPayPalUseStructuralCustomIdSchema'); + } + /** * @return mixed */ diff --git a/src/Service/Payment.php b/src/Service/Payment.php index 5b3d10de..af39adb4 100644 --- a/src/Service/Payment.php +++ b/src/Service/Payment.php @@ -24,6 +24,7 @@ use OxidSolutionCatalysts\PayPal\Exception\PayPalException; use OxidSolutionCatalysts\PayPal\Exception\UserPhone as UserPhoneException; use OxidSolutionCatalysts\PayPal\Model\PayPalOrder as PayPalOrderModel; +use OxidSolutionCatalysts\PayPal\Module; use OxidSolutionCatalysts\PayPal\Service\ModuleSettings as ModuleSettingsService; use OxidSolutionCatalysts\PayPal\Traits\ServiceContainer; use OxidSolutionCatalysts\PayPalApi\Exception\ApiException; @@ -128,7 +129,7 @@ public function doCreatePayPalOrder( $basket, $intent, $userAction, - $order instanceof EshopModelOrder ? $order->getFieldData('oxordernr') : null, + null, //customId is patched in doCapturePayPalOrder (ordernr is unavailable at this point) $processingInstruction, $paymentSource, null, @@ -309,10 +310,8 @@ public function doCapturePayPalOrder( } elseif ($payPalOrder->status !== Constants::PAYPAL_STATUS_COMPLETED) { $request = new OrderCaptureRequest(); //order number must be resolved before order patching - $shopOrderId = $order->getFieldData('oxordernr'); - if (!$shopOrderId) { + if (!$order->hasOrderNumber()){ $order->setOrderNumber(); - $shopOrderId = $order->getFieldData('oxordernr'); } try { @@ -320,7 +319,7 @@ public function doCapturePayPalOrder( $this->doPatchPayPalOrder( Registry::getSession()->getBasket(), $checkoutOrderId, - $shopOrderId + $this->getCustomIdParameter($order) ); /** @var $result ApiOrderModel */ @@ -808,4 +807,29 @@ private function displayErrorIfInstrumentDeclined(?string $issue): void ); } } + + /** + * @param \OxidEsales\Eshop\Application\Model\Order|null $order + * @return mixed|null + */ + public function getCustomIdParameter(?EshopModelOrder $order): string + { + /** @var ModuleSettingsService $moduleSettings */ + $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class); + $module = oxNew(\OxidEsales\Eshop\Core\Module\Module::class); + $module->load(Module::MODULE_ID); + $orderNumber = $order instanceof EshopModelOrder ? $order->getFieldData('oxordernr') : null; + + if($moduleSettings->isCustomIdSchemaStructural()){ + $customID = [ + 'oxordernr' => $orderNumber, + 'moduleVersion' => $module->getInfo('version'), + 'oxidVersion' => \OxidEsales\Eshop\Core\ShopVersion::getVersion() + ]; + + return json_encode($customID); + } + + return $orderNumber; + } } diff --git a/views/admin/de/admin_lang.php b/views/admin/de/admin_lang.php index cdc98995..48f9c4da 100755 --- a/views/admin/de/admin_lang.php +++ b/views/admin/de/admin_lang.php @@ -290,4 +290,7 @@ // PayPal Payment 'OSC_PAYPAL_PAYMENT_DEPRECATED' => 'Diese PayPal Zahlungsart kann nicht mehr aktiviert werden, da diese demnächst entfernt wird!', + + 'OSC_PAYPAL_CUSTOM_ID_CONTENTS_TITLE' => 'PayPal Inhalte des benutzerdefinierten ID-Feldes', + 'OSC_PAYPAL_CUSTOM_ID_CONTENTS_DESC' => 'Das benutzerdefinierte PayPal-ID-Feld kann entweder nur den Bestellnummernwert oder ein JSON mit zusätzlichen Daten enthalten.', ]; diff --git a/views/admin/en/admin_lang.php b/views/admin/en/admin_lang.php index b8be4f60..8afe9c35 100755 --- a/views/admin/en/admin_lang.php +++ b/views/admin/en/admin_lang.php @@ -291,4 +291,7 @@ // PayPal Payment 'OSC_PAYPAL_PAYMENT_DEPRECATED' => 'This PayPal payment method can no longer be activated as it will be removed soon!', + + 'OSC_PAYPAL_CUSTOM_ID_CONTENTS_TITLE' => 'PayPal custom id field contents', + 'OSC_PAYPAL_CUSTOM_ID_CONTENTS_DESC' => 'PayPal custom id field will be JSON encoded string with order number, shop version and the PayPal module version.', ]; diff --git a/views/admin/tpl/oscpaypalconfig.tpl b/views/admin/tpl/oscpaypalconfig.tpl index ad8b69ba..af886889 100755 --- a/views/admin/tpl/oscpaypalconfig.tpl +++ b/views/admin/tpl/oscpaypalconfig.tpl @@ -549,6 +549,28 @@ + +
+
+ +
+
+
+
+
+
+
+ isCustomIdSchemaStructural()}] checked[{/if}]> + [{oxmultilang ident="OSC_PAYPAL_CUSTOM_ID_CONTENTS_DESC"}] +
+
+
+
+
+
+
[{*