From b151114f4cfc9201d89eac39f55a0c69f4562f97 Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Wed, 7 Feb 2024 13:42:35 +0530
Subject: [PATCH] Feb 7 [UPDT] : Updated 'payment_paytabs_odoo'

---
 payment_paytabs_odoo/doc/RELEASE_NOTES.md          | 9 +++++++++
 payment_paytabs_odoo/models/payment_provider.py    | 4 +---
 payment_paytabs_odoo/models/payment_transaction.py | 8 ++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/payment_paytabs_odoo/doc/RELEASE_NOTES.md b/payment_paytabs_odoo/doc/RELEASE_NOTES.md
index f4b25c293..0fb20de90 100644
--- a/payment_paytabs_odoo/doc/RELEASE_NOTES.md
+++ b/payment_paytabs_odoo/doc/RELEASE_NOTES.md
@@ -5,3 +5,12 @@
 #### ADD
 
 - Initial commit for PayTabs Payment Acquirer
+
+
+## Module <payment_paytabs_odoo>
+
+#### 31.01.2024
+#### Version 16.0.1.1.1
+#### BUGFIX
+
+- Added the Payment Process for Countries like the UAE, KSA	,Jordan and etc
diff --git a/payment_paytabs_odoo/models/payment_provider.py b/payment_paytabs_odoo/models/payment_provider.py
index 71d11ad45..58bff3ec9 100644
--- a/payment_paytabs_odoo/models/payment_provider.py
+++ b/payment_paytabs_odoo/models/payment_provider.py
@@ -46,9 +46,7 @@ class PaymentProvider(models.Model):
                               help="PayTabs profile id of the user")
     api_key = fields.Char(string='Api Key', required_if_provider='paytabs',
                           groups='base.group_user', help="PayTabs Server key")
-    domain = fields.Char(string='Domain', help='Domain for the url,'
-                                               'It should not contain PORT'
-                                               'Number')
+    domain = fields.Char(string='Api endpoint', help='API endpoint of Paytabs')
 
     @api.model
     def _get_payment_method_information(self):
diff --git a/payment_paytabs_odoo/models/payment_transaction.py b/payment_paytabs_odoo/models/payment_transaction.py
index f9d95fbac..2d1f15d63 100644
--- a/payment_paytabs_odoo/models/payment_transaction.py
+++ b/payment_paytabs_odoo/models/payment_transaction.py
@@ -91,9 +91,9 @@ class PaymentTransaction(models.Model):
     def execute_payment(self):
         """Fetching data and Executing Payment
         :return: The response content."""
-        api_url = 'https://secure-global.paytabs.com/payment/request'
-        domain_url = self.env['payment.provider'].search(
+        api_url = self.env['payment.provider'].search(
             [('code', '=', 'paytabs')]).domain
+        base_url = self.env['ir.config_parameter'].get_param('web.base.url')
         sale_order = self.env['payment.transaction'].search(
             [('id', '=', self.id)]).sale_order_ids
         paytabs_values = {
@@ -104,9 +104,9 @@ class PaymentTransaction(models.Model):
             "cart_id": self.reference,
             "cart_currency": self.currency_id.name,
             "cart_amount": (self.amount - sale_order.amount_tax),
-            'return': urls.url_join(domain_url,
+            'return': urls.url_join(base_url,
                                     PaymentPaytabs._return_url),
-            'callback': urls.url_join(domain_url,
+            'callback': urls.url_join(base_url,
                                       PaymentPaytabs._return_url),
             "api_url": api_url,
             "customer_details": {