hisham-cmd commited on
Commit
9e16063
·
verified ·
1 Parent(s): 8b68e9e

Update backend with high-quality catalog and fixes

Browse files
app/api/admin.py CHANGED
@@ -309,7 +309,9 @@ def get_order_payment_details(
309
  payment_info = {
310
  "provider": payment.provider,
311
  "status": payment.status.value,
312
- "receipt_url": payment.receipt_url
 
 
313
  }
314
 
315
  return {
 
309
  payment_info = {
310
  "provider": payment.provider,
311
  "status": payment.status.value,
312
+ "receipt_url": payment.receipt_url,
313
+ "bank_account_id": payment.bank_account_id,
314
+ "crypto_network_id": payment.crypto_network_id
315
  }
316
 
317
  return {
app/api/orders.py CHANGED
@@ -121,7 +121,9 @@ def checkout(
121
  payment = Payment(
122
  order_id=order.id,
123
  provider=request.payment_method,
124
- status=PaymentStatus.PENDING
 
 
125
  )
126
  db.add(payment)
127
 
 
121
  payment = Payment(
122
  order_id=order.id,
123
  provider=request.payment_method,
124
+ status=PaymentStatus.PENDING,
125
+ bank_account_id=request.bank_account_id,
126
+ crypto_network_id=request.crypto_network_id
127
  )
128
  db.add(payment)
129
 
app/models/order.py CHANGED
@@ -65,6 +65,8 @@ class Payment(Base):
65
  status = Column(SQLEnum(PaymentStatus), default=PaymentStatus.PENDING, nullable=False)
66
  transaction_id = Column(String(255), nullable=True, unique=True)
67
  receipt_url = Column(String(255), nullable=True) # Added for Bank Transfer receipts
 
 
68
  created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
69
 
70
  order = relationship("Order", back_populates="payment")
 
65
  status = Column(SQLEnum(PaymentStatus), default=PaymentStatus.PENDING, nullable=False)
66
  transaction_id = Column(String(255), nullable=True, unique=True)
67
  receipt_url = Column(String(255), nullable=True) # Added for Bank Transfer receipts
68
+ bank_account_id = Column(String(50), nullable=True) # ID of chosen bank account
69
+ crypto_network_id = Column(String(50), nullable=True) # ID of chosen crypto network
70
  created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
71
 
72
  order = relationship("Order", back_populates="payment")
app/models/settings.py CHANGED
@@ -1,4 +1,4 @@
1
- from sqlalchemy import Column, Integer, String
2
  from app.db.base import Base
3
 
4
  class StoreSettings(Base):
@@ -12,3 +12,6 @@ class StoreSettings(Base):
12
  contact_email = Column(String, nullable=True)
13
  contact_phone = Column(String, nullable=True)
14
  global_discount = Column(Integer, default=0) # Percentage to apply globally
 
 
 
 
1
+ from sqlalchemy import Column, Integer, String, JSON
2
  from app.db.base import Base
3
 
4
  class StoreSettings(Base):
 
12
  contact_email = Column(String, nullable=True)
13
  contact_phone = Column(String, nullable=True)
14
  global_discount = Column(Integer, default=0) # Percentage to apply globally
15
+ crypto_networks = Column(JSON, default=list) # List of dicts representing CryptoNetwork
16
+ bank_accounts = Column(JSON, default=list) # List of dicts representing BankAccount
17
+
app/schemas/order.py CHANGED
@@ -52,6 +52,8 @@ class PaymentResponse(BaseModel):
52
  status: PaymentStatus
53
  transaction_id: Optional[str]
54
  receipt_url: Optional[str] = None
 
 
55
  created_at: datetime
56
 
57
  class Config:
@@ -71,6 +73,8 @@ class OrderCreate(BaseModel):
71
  guest_email: Optional[str] = None
72
  guest_phone: Optional[str] = Field(None, max_length=50)
73
  payment_method: str = "card"
 
 
74
 
75
  class OrderUpdateStatus(BaseModel):
76
  status: OrderStatus
 
52
  status: PaymentStatus
53
  transaction_id: Optional[str]
54
  receipt_url: Optional[str] = None
55
+ bank_account_id: Optional[str] = None
56
+ crypto_network_id: Optional[str] = None
57
  created_at: datetime
58
 
59
  class Config:
 
73
  guest_email: Optional[str] = None
74
  guest_phone: Optional[str] = Field(None, max_length=50)
75
  payment_method: str = "card"
76
+ bank_account_id: Optional[str] = None
77
+ crypto_network_id: Optional[str] = None
78
 
79
  class OrderUpdateStatus(BaseModel):
80
  status: OrderStatus
app/schemas/settings.py CHANGED
@@ -1,5 +1,19 @@
1
  from pydantic import BaseModel
2
- from typing import Optional
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
 
4
  class StoreSettingsBase(BaseModel):
5
  store_name: str
@@ -9,6 +23,8 @@ class StoreSettingsBase(BaseModel):
9
  contact_email: Optional[str] = None
10
  contact_phone: Optional[str] = None
11
  global_discount: int = 0
 
 
12
 
13
  class StoreSettingsUpdate(StoreSettingsBase):
14
  pass
 
1
  from pydantic import BaseModel
2
+ from typing import Optional, List
3
+
4
+ class CryptoNetwork(BaseModel):
5
+ id: str
6
+ currency: str
7
+ network: str
8
+ wallet_address: str
9
+ barcode_url: Optional[str] = None
10
+
11
+ class BankAccount(BaseModel):
12
+ id: str
13
+ bank_name: str
14
+ account_name: str
15
+ account_number: str
16
+ iban: str
17
 
18
  class StoreSettingsBase(BaseModel):
19
  store_name: str
 
23
  contact_email: Optional[str] = None
24
  contact_phone: Optional[str] = None
25
  global_discount: int = 0
26
+ crypto_networks: List[CryptoNetwork] = []
27
+ bank_accounts: List[BankAccount] = []
28
 
29
  class StoreSettingsUpdate(StoreSettingsBase):
30
  pass