fix

.env.example

@@ -15,3 +15,9 @@ EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST='smtp.gmail.com'
 EMAIL_PORT=587
 EMAIL_USE_TLS=True
+
+
+CONSUMER_KEY=
+CONSUMER_SECRET=
+STORE_ID=
+API_KEY=

core/services/payment.py

@@ -9,9 +9,6 @@ class Atmos:
         self.consumer_secret = settings.CONSUMER_SECRET
         self.terminal_id = terminal_id
         self.store_id = settings.STORE_ID
-        self.global_consumer_key = settings.GLOBAL_CONSUMER_KEY
-        self.global_consumer_secret = settings.GLOBAL_CONSUMER_SECRET
-        self.global_store_id = settings.GLOBAL_STORE_ID
 
     def login(self):
         credentials = f"{self.consumer_key}:{self.consumer_secret}"
@@ -22,44 +19,6 @@ class Atmos:
             "Content-Type": "application/x-www-form-urlencoded",
         }
 
-        data = {
-            "grant_type": "client_credentials"
-        }
-        url = 'https://partner.atmos.uz/token'
-        res = requests.post(url, headers=headers, data=data)
-        return res.json()['access_token']
-    
-    def create_transaction(self, amount, account):
-        access_token = self.login()
-
-        url = 'https://partner.atmos.uz/merchant/pay/create'
-        headers = {
-            'Authorization': f'Bearer {access_token}',
-        }
-        data = {
-            'amount': int(amount) * 100,
-            'account': str(account),
-            'store_id': f'{self.store_id}'
-        }
-
-        res = requests.post(url, headers=headers, json=data)
-        return res.json()
-    
-    def generate_url(self, transaction_id, redirect_url):
-        url = f'http://test-checkout.pays.uz/invoice/get?storeId={self.store_id}&transactionId={transaction_id}&redirectLink={redirect_url}'
-        return url
-
-
-    # Visa/MasterCard
-    def login_global_payment(self):
-        credentials = f"{self.global_consumer_key}:{self.global_consumer_secret}"
-        encoded_credentials = base64.b64encode(credentials.encode()).decode()
-
-        headers = {
-            "Authorization": f"Basic {encoded_credentials}",
-            "Content-Type": "application/x-www-form-urlencoded",
-        }
-
         data = {
             "grant_type": "client_credentials"
         }
@@ -67,8 +26,30 @@ class Atmos:
         res = requests.post(url, headers=headers, data=data)
         return res.json()['access_token']
     
+    def create_transaction(self, amount, account):
+        access_token = self.login()
+
+        url = 'https://apigw.atmos.uz/merchant/pay/create'
+        headers = {
+            'Authorization': f'Bearer {access_token}',
+        }
+        data = {
+            'amount': int(amount) * 100,
+            'account': str(account),
+            'store_id': f'{self.store_id}'
+        }
+
+        res = requests.post(url, headers=headers, json=data)
+        return res.json()
+    
+    def generate_url(self, transaction_id, redirect_url):
+        url = f'https://checkout.pays.uz/invoice/get?storeId={self.store_id}&transactionId={transaction_id}&redirectLink={redirect_url}'
+        return url
+
+
+    # Visa/MasterCard
     def global_payment(self, request_id, account, amount):
-        access = self.login_global_payment()
+        access = self.login()
         url = 'https://apigw.atmos.uz/checkout/invoice/create'
         headers = {
             'Authorization': f'Bearer {access}',
@@ -76,7 +57,7 @@ class Atmos:
         }
         data = {
             "request_id": request_id,
-            "store_id": self.global_store_id,
+            "store_id": self.store_id,
             "account": str(account),
             "amount": amount * 100,
             "success_url": "https://wisdom.uz",