Commit c23be92a authored by spncr's avatar spncr
Browse files

Issue #3248374 by spncr: Drupal 9 compatibility v3 

* Renamed local properties to match Drupal Styles
* Fairly trivial commit to give us a new spot to tag for 4.0-rc1 release
parent 9fca92ac

src/Plugin/Commerce/PaymentGateway/CreditCardGateway.php

+8 −8
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class CreditCardGateway extends CommerceIatsGatewayBase implements SupportsAutho 
    $amount = $payment->getAmount();



    $account = $payment->getOrder()->getCustomer();

    $vaultKey = $this->getCommerceIats()->getUserVaultId($account);

    $vault_key = $this->getCommerceIats()->getUserVaultId($account);



    $transaction_data = [

      'orderId' => $payment->getOrderId() . '-' . $this->time->getCurrentTime(),
@@ -53,7 +53,7 @@ class CreditCardGateway extends CommerceIatsGatewayBase implements SupportsAutho 
    try {

      if ($capture) {

        $result = $this->getGateway()->firstPayCcSale(

          $vaultKey,

          $vault_key,

          $payment_method->getRemoteId(),

          $transaction_data

        );
@@ -61,7 +61,7 @@ class CreditCardGateway extends CommerceIatsGatewayBase implements SupportsAutho 
      }

      else {

        $result = $this->getGateway()->firstPayCcAuth(

          $vaultKey,

          $vault_key,

          $payment_method->getRemoteId(),

          $transaction_data

        );
@@ -164,7 +164,7 @@ class CreditCardGateway extends CommerceIatsGatewayBase implements SupportsAutho 
   */

  public function createPaymentMethod(PaymentMethodInterface $payment_method, array $payment_details) {

    $gateway = $this->getGateway();

    $vaultKey = $this->getCommerceIats()

    $vault_key = $this->getCommerceIats()

      ->getUserVaultId($payment_method->getOwner());



    $data = $this->setPaymentMethodBillingInfo($payment_method);
@@ -181,7 +181,7 @@ class CreditCardGateway extends CommerceIatsGatewayBase implements SupportsAutho 


    // Add credit card to the vault.

    try {

      $result = $gateway->vaultCcCreate($vaultKey, $data);

      $result = $gateway->vaultCcCreate($vault_key, $data);

      $id = $result->id;

    }

    catch (GatewayException $e) {
@@ -197,7 +197,7 @@ class CreditCardGateway extends CommerceIatsGatewayBase implements SupportsAutho 


    // Get the credit card details from the vault.

    try {

      $result = $gateway->vaultCcLoad($vaultKey, $id);

      $result = $gateway->vaultCcLoad($vault_key, $id);

    }

    catch (\Exception $e) {

      throw new GenericPaymentGatewayException();
@@ -220,9 +220,9 @@ class CreditCardGateway extends CommerceIatsGatewayBase implements SupportsAutho 
   */

  public function deletePaymentMethod(PaymentMethodInterface $payment_method) {

    $gateway = $this->getGateway();

    $vaultKey = $this->getCommerceIats()

    $vault_key = $this->getCommerceIats()

      ->getUserVaultId($payment_method->getOwner());

    $gateway->vaultCcDelete($vaultKey, $payment_method->getRemoteId());

    $gateway->vaultCcDelete($vault_key, $payment_method->getRemoteId());

    $payment_method->delete();

  }

src/Rest/Gateway.php

+2 −2
Original line number Diff line number Diff line
@@ -253,10 +253,10 @@ class Gateway implements GatewayInterface { 
   */

  public function vaultQuery(array $data = []) {

    $vaults = $this->post('VaultQueryVault', $data)->data->VaultContainers;

    $vaultIds = array_map(function ($item) {

    $vault_ids = array_map(function ($item) {

      return $item->vaultId;

    }, $vaults);

    return array_combine($vaultIds, $vaults);

    return array_combine($vault_ids, $vaults);

  }



}

tests/src/Functional/CommerceIatsSetupTest.php

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ class CommerceIatsSetupTest extends BrowserTestBase { 
   * Tests setting up the hosted form processor.

   */

  public function testSetupHostedForm() {

    $adminUser = $this->drupalCreateUser(['administer commerce_payment_gateway']);

    $this->drupalLogin($adminUser);

    $admin_user = $this->drupalCreateUser(['administer commerce_payment_gateway']);

    $this->drupalLogin($admin_user);

    $this->drupalGet('admin/commerce/config/payment-gateways/add');



    $values = [