Merge pull request #324 from OXID-eSales/b-7.0.x-fix-applecert-UNZER-512

B 7.0.x fix applecert unzer 512

CHANGELOG.md

@@ -35,6 +35,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - fix show multiple vouchers separately
 - fix: only OK, NOT_FINISHED or CANCEL in oxorder->oxtranstatus allowed
 - fix showing correct amount when cancelling in admin
+- Order of credit card data input fields optimized
+- Add Descriptor for PrePayment on ThankYou-Page
+- remove Option "Capture Later"-Option for ApplePay
 
 ## [2.1.4] - 2023-11-23
 

metadata.php

@@ -53,7 +53,7 @@
             </ul>',
     ],
     'thumbnail'   => 'logo.svg',
-    'version'     => '2.2.0-rc.12',
+    'version'     => '2.2.0-rc.13',
     'author'      => 'OXID eSales AG',
     'url'         => 'https://www.oxid-esales.com',
     'email'       => '[email protected]',
@@ -226,13 +226,6 @@
             'value'       => '0',
             'constraints' => '0|1'
         ],
-        [
-            'group'       => 'unzerapplepay',
-            'name'        => 'UnzerOption_oscunzer_applepay',
-            'type'        => 'select',
-            'value'       => '0',
-            'constraints' => '0|1'
-        ],
         [
             'group' => 'unzerapplepay',
             'name'  => 'applepay_merchant_capabilities',

src/Controller/Admin/AdminOrderController.php

@@ -11,10 +11,8 @@
 
 use OxidEsales\Eshop\Application\Controller\Admin\AdminDetailsController;
 use OxidEsales\Eshop\Core\Registry;
-use OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Model\Payment;
-use OxidSolutionCatalysts\Unzer\Model\Order as UnzerOrder;
 use OxidSolutionCatalysts\Unzer\Model\TransactionList;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
 use OxidSolutionCatalysts\Unzer\Service\Translator;
@@ -204,7 +202,7 @@ protected function getUnzerViewData(string $sPaymentId, string $sTypeId): void
                 $editObject->getFieldData('oxpaid') == '0000-00-00 00:00:00' &&
                 $fCharged == $unzerPayment->getAmount()->getTotal()
             ) {
-                /** @var UnzerOrder $editObject */
+                /** @var Order $editObject */
                 $editObject->markUnzerOrderAsPaid();
                 $this->forceReloadListFrame();
             }