Merge branch 'regenerate_midtrans_web' of https://bitbucket.org/altafixco/indoteknik-addons into regenerate_midtrans_web

1 files changed, 12 insertions, 9 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index ffb53dce..8cb169a6 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1900,26 +1900,30 @@ class SaleOrder(models.Model):
         #     raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     def generate_payment_link_midtrans_sales_order(self):
-        # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox
-        # midtrans_auth = 'Basic U0ItTWlkLXNlcnZlci1uLVY3ZDJjMlpCMFNWRUQyOU95Q1dWWXA6' # dev - sandbox
-        midtrans_url = 'https://app.midtrans.com/snap/v1/transactions'  # production
-        midtrans_auth = 'Basic TWlkLXNlcnZlci1SbGMxZ2gzWGpSVW5scl9JblZzTV9OTnU6'  # production
+        # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions'  # dev - sandbox
+        # midtrans_auth = 'Basic U0ItTWlkLXNlcnZlci1uLVY3ZDJjMlpCMFNWRUQyOU95Q1dWWXA6'  # dev - sandbox
+        midtrans_url = 'https://app.midtrans.com/snap/v1/transactions'          # production
+        midtrans_auth = 'Basic TWlkLXNlcnZlci1SbGMxZ2gzWGpSVW5scl9JblZzTV9OTnU6' # production
+
         so_number = self.name
         so_number = so_number.replace('/', '-')
         so_grandtotal = math.floor(self.grand_total)
+
         headers = {
             'Accept': 'application/json',
             'Content-Type': 'application/json',
             'Authorization': midtrans_auth,
         }
 
-        check_url = f'https://api.midtrans.com/v2/{so_number}/status'
-        check_response = requests.get(check_url, headers=headers)
+        # ==== ENV ====
+        # check_url = f'https://api.sandbox.midtrans.com/v2/{so_number}/status'  # dev - sandbox
+        check_url = f'https://api.midtrans.com/v2/{so_number}/status'        # production
+        # =============================================
 
+        check_response = requests.get(check_url, headers=headers)
         if check_response.status_code == 200:
             status_response = check_response.json()
-            if status_response.get('transaction_status') == 'expire' or status_response.get(
-                    'transaction_status') == 'cancel':
+            if status_response.get('transaction_status') in ('expire', 'cancel'):
                 so_number = so_number + '-cpl'
 
         json_data = {
@@ -1951,7 +1955,6 @@ class SaleOrder(models.Model):
             buffer = BytesIO()
             img.save(buffer, format="PNG")
             qr_code_img = base64.b64encode(buffer.getvalue()).decode()
-
             self.payment_qr_code = qr_code_img
 
     @api.model