Moved charge() method to Omise_Payment_Offsite to avoid repeating sam…

…e code. Payment method class can override the method if they have more request to pass to charge API.
omise · Oct 11, 2023 · 0ed6a9c · 0ed6a9c
1 parent 01a0825
commit 0ed6a9c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 90 deletions.
diff --git a/includes/gateway/abstract-omise-payment-offsite.php b/includes/gateway/abstract-omise-payment-offsite.php
@@ -50,4 +50,16 @@ public function check_bank_selected($fields, $errors)
 			$errors->add('validation', __('Please select bank below', 'omise'));
 		}
 	}
+
+	/**
+	 * Override charge() method in the child class if the payment method requires
+	 * more data than received from build_charge_request()
+	 */
+	public function charge($order_id, $order)
+	{
+		$requestData = $this->build_charge_request(
+			$order_id, $order, $this->source_type, $this->id . "_callback"
+		);
+		return OmiseCharge::create($requestData);
+	}
 }
diff --git a/includes/gateway/class-omise-payment-alipay.php b/includes/gateway/class-omise-payment-alipay.php
@@ -51,15 +51,4 @@ public function init_form_fields() {
 			),
 		);
 	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . "_callback"
-		);
-		return OmiseCharge::create($requestData);
-	}
 }
diff --git a/includes/gateway/class-omise-payment-boost.php b/includes/gateway/class-omise-payment-boost.php
@@ -52,17 +52,6 @@ public function init_form_fields() {
 		);
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . "_callback"
-		);
-		return OmiseCharge::create($requestData);
-	}
-
 	/**
 	 * Get icons
 	 *

diff --git a/includes/gateway/class-omise-payment-duitnow-qr.php b/includes/gateway/class-omise-payment-duitnow-qr.php
@@ -52,17 +52,6 @@ public function init_form_fields() {
 		);
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . "_callback"
-		);
-		return OmiseCharge::create($requestData);
-	}
-
 	/**
 	 * Get icons
 	 *

diff --git a/includes/gateway/class-omise-payment-grabpay.php b/includes/gateway/class-omise-payment-grabpay.php
@@ -52,17 +52,6 @@ public function init_form_fields() {
 		);
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . "_callback"
-		);
-		return OmiseCharge::create($requestData);
-	}
-
 	/**
 	 * Get icons
 	 *

diff --git a/includes/gateway/class-omise-payment-maybank-qr.php b/includes/gateway/class-omise-payment-maybank-qr.php
@@ -52,17 +52,6 @@ public function init_form_fields() {
 		);
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . "_callback"
-		);
-		return OmiseCharge::create($requestData);
-	}
-
 	/**
 	 * Get icons
 	 *

diff --git a/includes/gateway/class-omise-payment-paypay.php b/includes/gateway/class-omise-payment-paypay.php
@@ -52,17 +52,6 @@ public function init_form_fields() {
 		);
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . '_callback'
-		);
-		return OmiseCharge::create($requestData);
-	}
-
 	/**
 	 * Get icons
 	 *

diff --git a/includes/gateway/class-omise-payment-shopeepay.php b/includes/gateway/class-omise-payment-shopeepay.php
@@ -60,17 +60,6 @@ public function init_form_fields() {
 		);
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . '_callback'
-		);
-		return OmiseCharge::create($requestData);
-	}
-
 	/**
 	 * Return the right ShopeePay backend depending on the platform and availability of
 	 * the backend in the capability

diff --git a/includes/gateway/class-omise-payment-touch-n-go.php b/includes/gateway/class-omise-payment-touch-n-go.php
@@ -72,17 +72,6 @@ public function GetMethodTitle() {
 		return $this->touch_and_go_wallet_title;
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function charge($order_id, $order)
-	{
-		$requestData = $this->build_charge_request(
-			$order_id, $order, $this->source_type, $this->id . '_callback'
-		);
-		return OmiseCharge::create($requestData);
-	}
-
 	/**
 	 * Get icons
 	 *
@@ -95,5 +84,4 @@ public function get_icon() {
 		]);
 		return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );
 	}
-
 }
diff --git a/includes/gateway/traits/charge-request-builder-trait.php b/includes/gateway/traits/charge-request-builder-trait.php
@@ -28,7 +28,7 @@ public function build_charge_request(
 			]);
 		}
 
-		if (!$callback_endpoint) {
+		if ($callback_endpoint) {
 			$return_uri = $this->get_redirect_url($callback_endpoint, $order_id, $order);
 
 			return array_merge($request, [