anydev/anyway
0
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge backend/micro-services-restructuring into main #69

Open
kscheidecker wants to merge 34 commits from backend/micro-services-restructuring into main
pull from: backend/micro-services-restructuring
merge into: anydev:main
Conversation 1 Commits 34 Files Changed 29 +4 -4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec28d67fca - Show all commits

4
backend/src/payments/payment_handler.py
View File

@@ -78,7 +78,7 @@ class OrderRequest(BaseModel):
self.total_price = 0 self.total_price = 0
self.total_credits = 0 self.total_credits = 0
for basket_item in self.basket: for basket_item in self.basket:
item = self.supabase_client.get_item(basket_item.id, self.currency) item = self.supabase_client.get_item(basket_item.item_id, self.currency)
self.items.append(item) self.items.append(item)
self.total_price += item.unit_price * basket_item.quantity # increment price self.total_price += item.unit_price * basket_item.quantity # increment price
self.total_credits += item.unit_credits * basket_item.quantity # increment credit balance self.total_credits += item.unit_credits * basket_item.quantity # increment credit balance
@@ -100,7 +100,7 @@ class OrderRequest(BaseModel):
for basket_item, item in zip(self.basket, self.items): for basket_item, item in zip(self.basket, self.items):
item_list.append({ item_list.append({
'id': item.id, 'id': item.item_id,
'name': item.name, 'name': item.name,
'description': item.description, 'description': item.description,
'quantity': str(basket_item.quantity), 'quantity': str(basket_item.quantity),

4
backend/src/payments/payment_router.py
View File

@@ -1,9 +1,9 @@
import logging import logging
from typing import Literal
from fastapi import APIRouter, Query, Body from fastapi import APIRouter, Query, Body
from fastapi.responses import RedirectResponse from fastapi.responses import RedirectResponse
from ..payments import PaypalClient, OrderRequest
from .payment_handler import PaypalClient, OrderRequest
from ..supabase.supabase import SupabaseClient from ..supabase.supabase import SupabaseClient
from ..cache import CreditCache, make_credit_cache_key from ..cache import CreditCache, make_credit_cache_key