From 5cf60908a43f8c74281111438415581f997efa96 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 16 Feb 2024 09:39:38 +0700 Subject: Add get all voucher api --- indoteknik_api/controllers/api_v1/voucher.py | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'indoteknik_api/controllers') diff --git a/indoteknik_api/controllers/api_v1/voucher.py b/indoteknik_api/controllers/api_v1/voucher.py index 3c056ecd..1888fe29 100644 --- a/indoteknik_api/controllers/api_v1/voucher.py +++ b/indoteknik_api/controllers/api_v1/voucher.py @@ -1,31 +1,39 @@ -from .. import controller +from bs4 import BeautifulSoup from odoo import http from odoo.http import request -from bs4 import BeautifulSoup + +from .. import controller class Voucher(controller.Controller): - prefix = '/api/v1/' + PREFIX_API = '/api/v1/' + + @http.route(PREFIX_API + 'voucher', auth='public', methods=['GET', 'OPTIONS']) + @controller.Controller.must_authorized() + def get_vouchers(self, **kw): + vouchers = request.env['voucher'].get_active_voucher([('visibility', 'in', ['public'])]) + vouchers = vouchers.res_format() + return self.response(vouchers) - @http.route(prefix + 'user//voucher', auth='public', methods=['GET', 'OPTIONS']) + @http.route(PREFIX_API + 'user//voucher', auth='public', methods=['GET', 'OPTIONS']) @controller.Controller.must_authorized(private=True, private_key='user_id') - def get_vouchers(self, **kw): + def get_vouchers_by_user_id(self, **kw): cart = request.env['website.user.cart'] code = kw.get('code') user_id = int(kw.get('user_id', 0)) source = kw.get('source') visibility = ['public'] - parameter = [] + domain = [] if code: visibility.append('private') - parameter += [('code', '=', code)] + domain += [('code', '=', code)] user_pricelist = request.env.context.get('user_pricelist') if user_pricelist: - parameter += [('excl_pricelist_ids', 'not in', [user_pricelist.id])] + domain += [('excl_pricelist_ids', 'not in', [user_pricelist.id])] - parameter += [('visibility', 'in', visibility)] - vouchers = request.env['voucher'].get_active_voucher(parameter) + domain += [('visibility', 'in', visibility)] + vouchers = request.env['voucher'].get_active_voucher(domain) checkout = cart.get_user_checkout(user_id, source=source) products = checkout['products'] -- cgit v1.2.3 From 899aa7d32ed7df8672dd7a7415500b44242dd89c Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 19 Feb 2024 10:16:20 +0700 Subject: Fix create or update cart api --- indoteknik_api/controllers/api_v1/cart.py | 38 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'indoteknik_api/controllers') diff --git a/indoteknik_api/controllers/api_v1/cart.py b/indoteknik_api/controllers/api_v1/cart.py index 907c8288..5948a277 100644 --- a/indoteknik_api/controllers/api_v1/cart.py +++ b/indoteknik_api/controllers/api_v1/cart.py @@ -52,6 +52,9 @@ class Cart(controller.Controller): if not user_id: return self.response(code=400, description='user_id is required') + if not product_id and not program_line_id: + return self.response(code=400, description='product_id or program_line_id is required') + website_user_cart = request.env['website.user.cart'] # Remove previous 'buy' entries for the user @@ -68,32 +71,33 @@ class Cart(controller.Controller): cart = website_user_cart.search(query, limit=1) data_to_update = { + 'user_id': user_id, 'qty': qty, 'is_selected': is_selected, 'program_line_id': program_line_id, - 'product_id': product_id + 'product_id': product_id, + 'source': source or False } - if program_line_id: - data_to_update['product_id'] = False - - if source: - data_to_update['source'] = source - - result = {} if cart: - # Update existing cart entry cart.write(data_to_update) - result['id'] = cart.id else: - # Create a new cart entry if it doesn't exist - create = website_user_cart.create({ - 'user_id': user_id, - **data_to_update - }) - result['id'] = create.id + cart = website_user_cart.create(data_to_update) - return self.response(result) + return self.response({ + 'id': cart.id, + 'product': { + 'id': cart.product_id.id, + 'name': cart.product_id.name + } if cart.product_id else None, + 'program_line': { + 'id': cart.program_line_id.id, + 'name': cart.program_line_id.name + } if cart.program_line_id else None, + 'qty': cart.qty, + 'is_selected': cart.is_selected, + 'source': cart.source + }) @http.route(PREFIX_USER + 'cart', auth='public', methods=['DELETE', 'OPTIONS'], csrf=False) @controller.Controller.must_authorized() -- cgit v1.2.3 From dd6544f7fa40d8e688349f2f143d258f6dd3eec7 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 19 Feb 2024 10:44:02 +0700 Subject: Fix get voucher api, ignore voucher for promotion program --- indoteknik_api/controllers/api_v1/voucher.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_api/controllers') diff --git a/indoteknik_api/controllers/api_v1/voucher.py b/indoteknik_api/controllers/api_v1/voucher.py index 1888fe29..53f118ec 100644 --- a/indoteknik_api/controllers/api_v1/voucher.py +++ b/indoteknik_api/controllers/api_v1/voucher.py @@ -43,6 +43,7 @@ class Voucher(controller.Controller): order_line = [] for product in products: + if product['cart_type'] == 'promotion': continue order_line.append({ 'product_id': request.env['product.product'].browse(product['id']), 'price': product['price']['price'], -- cgit v1.2.3