<hapit>merge

2 files changed, 205 insertions, 130 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index f116f189..0527345e 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -3,6 +3,9 @@ from odoo import http
 from datetime import datetime, timedelta
 from odoo.http import request
 import json
+import logging
+
+_logger = logging.getLogger(__name__)
 
 
 class SaleOrder(controller.Controller):
@@ -465,138 +468,210 @@ class SaleOrder(controller.Controller):
     @http.route(PREFIX_PARTNER + 'sale_order/checkout', auth='public', method=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def create_partner_sale_order(self, **kw):
-        config = request.env['ir.config_parameter']
-        product_pricelist_default_discount_id = int(config.get_param('product.pricelist.tier1_v2'))
-        user_pricelist = request.env.context.get('user_pricelist').id or False
+        _logger.info("=== START CREATE PARTNER SALE ORDER ===")
+
+        try:
+            config = request.env['ir.config_parameter']
+            product_pricelist_default_discount_id = int(config.get_param('product.pricelist.tier1_v2'))
+            user_pricelist = request.env.context.get('user_pricelist').id or False
+            _logger.info(
+                f"Config - Default Pricelist: {product_pricelist_default_discount_id}, User Pricelist: {user_pricelist}")
+
+            params = self.get_request_params(kw, {
+                'user_id': ['number'],
+                'partner_id': ['number'],
+                'partner_shipping_id': ['required', 'number'],
+                'partner_invoice_id': ['required', 'number'],
+                'order_line': ['required', 'default:[]'],
+                'po_number': [],
+                'po_file': [],
+                'type': [],
+                'delivery_amount': ['number', 'default:0'],
+                'carrier_id': [],
+                'delivery_service_type': [],
+                'flash_sale': ['boolean'],
+                'note_website': [],
+                'voucher': [],
+                'source': [],
+                'estimated_arrival_days': ['number', 'default:0'],
+                'estimated_arrival_days_start': ['number', 'default:0']
+            })
 
-        params = self.get_request_params(kw, {
-            'user_id': ['number'],
-            'partner_id': ['number'],
-            'partner_shipping_id': ['required', 'number'],
-            'partner_invoice_id': ['required', 'number'],
-            'order_line': ['required', 'default:[]'],
-            'po_number': [],
-            'po_file': [],
-            'type': [],
-            'delivery_amount': ['number', 'default:0'],
-            'carrier_id': [],
-            'delivery_service_type': [],
-            'flash_sale': ['boolean'],
-            'note_website': [],
-            'voucher': [],
-            'source': [],
-            'estimated_arrival_days': ['number', 'default:0'],
-            'estimated_arrival_days_start': ['number', 'default:0']
-        })
-        
-        if not params['valid']:
-            return self.response(code=400, description=params)
+            _logger.info(f"Raw input params: {kw}")
+            _logger.info(f"Processed params: {params}")
 
-        # Fetch partner details
-        sales_partner = request.env['res.partner'].browse(params['value']['partner_id'])
-        partner_invoice = request.env['res.partner'].browse(params['value']['partner_invoice_id'])
-        main_partner = partner_invoice.get_main_parent()
-        parameters = {
-            'warehouse_id': 8,
-            'carrier_id': 1,
-            'sales_tax_id': 23,
-            'pricelist_id': user_pricelist or product_pricelist_default_discount_id,
-            'payment_term_id': 26,
-            'team_id': 2,
-            'company_id': 1,
-            'currency_id': 12,
-            'source_id': 59,
-            'state': 'draft',
-            'picking_policy': 'direct',
-            'partner_id': params['value']['partner_id'],
-            'partner_shipping_id': params['value']['partner_shipping_id'],
-            'real_shipping_id': params['value']['partner_shipping_id'],
-            'partner_invoice_id': main_partner.id,
-            'real_invoice_id': params['value']['partner_invoice_id'],
-            'partner_purchase_order_name': params['value']['po_number'],
-            'partner_purchase_order_file': params['value']['po_file'],
-            'delivery_amt': params['value']['delivery_amount'] * 1.10,
-            'estimated_arrival_days': params['value']['estimated_arrival_days'],
-            'estimated_arrival_days_start': params['value']['estimated_arrival_days_start'],
-            'shipping_cost_covered': 'customer',
-            'shipping_paid_by': 'customer',
-            'carrier_id': params['value']['carrier_id'],
-            'delivery_service_type': params['value']['delivery_service_type'],
-            'flash_sale': params['value']['flash_sale'], 
-            'note_website': params['value']['note_website'],
-            'customer_type': sales_partner.customer_type if sales_partner else 'nonpkp',  # Get Customer Type from partner
-            'npwp': sales_partner.npwp or '0',  # Get NPWP from partner
-            'sppkp': sales_partner.sppkp,  # Get SPPKP from partner
-            'email': sales_partner.email,  # Get Email from partner
-            'user_id': 11314  # User ID: Boy Revandi
-        }
-        
-        sales_partner = request.env['res.partner'].browse(parameters['partner_id'])
-        if sales_partner and sales_partner.user_id and sales_partner.user_id.id not in [25]: # 25: System
-            parameters['user_id'] = sales_partner.user_id.id    
-            
-        if params['value']['type'] == 'sale_order':
-            parameters['approval_status'] = 'pengajuan1'
-        sale_order = request.env['sale.order'].with_context(from_website_checkout=True).create([parameters])
-        sale_order.onchange_partner_contact()
-
-        user_id = params['value']['user_id']
-        user_cart = request.env['website.user.cart']
-        source = params['value']['source']
-        carts = user_cart.get_product_by_user(user_id=user_id, selected=True, source=source)
-
-        promotions = []
-        for cart in carts:
-            if cart['cart_type'] == 'product':
-                order_line = request.env['sale.order.line'].create({
-                    'company_id': 1,
-                    'order_id': sale_order.id,
-                    'product_id': cart['id'],
-                    'product_uom_qty': cart['quantity'],
-                    'product_available_quantity': cart['available_quantity']
-                })
-                order_line.product_id_change()
-                order_line.weight = order_line.product_id.weight
-                order_line.onchange_vendor_id()
-                order_line.price_unit = cart['price']['price']
-                order_line.discount = cart['price']['discount_percentage']
-            elif cart['cart_type'] == 'promotion':
-                promotions.append({
-                    'order_id': sale_order.id,
-                    'program_line_id': cart['id'],
-                    'quantity': cart['quantity']
-                })
-        
-        sale_order._compute_etrts_date()
+            if not params['valid']:
+                _logger.error(f"Invalid params: {params}")
+                return self.response(code=400, description=params)
 
-        request.env['sale.order.promotion'].create(promotions)
-        
-        if len(promotions) > 0:
-            sale_order.apply_promotion_program()
-            sale_order.add_free_product(promotions)
-
-        voucher_code = params['value']['voucher']
-        voucher = request.env['voucher'].search([('code', '=', voucher_code),('apply_type', 'in', ['all', 'brand'])], limit=1)
-        voucher_shipping = request.env['voucher'].search([('code', '=', voucher_code),('apply_type', 'in', ['shipping'])], limit=1)
-        if voucher and len(promotions) == 0:
-            sale_order.voucher_id = voucher.id
-            sale_order.apply_voucher()
-        
-        if voucher_shipping and len(promotions) == 0:
-            sale_order.voucher_shipping_id = voucher_shipping.id
-            sale_order.apply_voucher_shipping()
-
-        cart_ids = [x['cart_id'] for x in carts]
-        if sale_order._requires_approval_margin_leader(): #jika ada error tambahkan kondisi if params['value']['type'] == 'sale_order':
-            sale_order.approval_status = 'pengajuan2'
-        elif sale_order._requires_approval_margin_manager():
-            sale_order.approval_status = 'pengajuan1'
-        # user_cart.browse(cart_ids).unlink()
-        sale_order._auto_set_shipping_from_website()
-        return self.response({
-            'id': sale_order.id,
-            'name': sale_order.name
-        })
+            # Fetch partner details
+            sales_partner = request.env['res.partner'].browse(params['value']['partner_id'])
+            partner_invoice = request.env['res.partner'].browse(params['value']['partner_invoice_id'])
+            main_partner = partner_invoice.get_main_parent()
+            _logger.info(
+                f"Partner Info - Sales: {sales_partner.id}, Invoice: {partner_invoice.id}, Main: {main_partner.id}")
+
+            parameters = {
+                'warehouse_id': 8,
+                'carrier_id': 1,
+                'sales_tax_id': 23,
+                'pricelist_id': user_pricelist or product_pricelist_default_discount_id,
+                'payment_term_id': 26,
+                'team_id': 2,
+                'company_id': 1,
+                'currency_id': 12,
+                'source_id': 59,
+                'state': 'draft',
+                'picking_policy': 'direct',
+                'partner_id': params['value']['partner_id'],
+                'partner_shipping_id': params['value']['partner_shipping_id'],
+                'real_shipping_id': params['value']['partner_shipping_id'],
+                'partner_invoice_id': main_partner.id,
+                'real_invoice_id': params['value']['partner_invoice_id'],
+                'partner_purchase_order_name': params['value']['po_number'],
+                'partner_purchase_order_file': params['value']['po_file'],
+                'delivery_amt': params['value']['delivery_amount'] * 1.10,
+                'estimated_arrival_days': params['value']['estimated_arrival_days'],
+                'estimated_arrival_days_start': params['value']['estimated_arrival_days_start'],
+                'shipping_cost_covered': 'customer',
+                'shipping_paid_by': 'customer',
+                'carrier_id': params['value']['carrier_id'],
+                'delivery_service_type': params['value']['delivery_service_type'],
+                'flash_sale': params['value']['flash_sale'],
+                'note_website': params['value']['note_website'],
+                'customer_type': sales_partner.customer_type if sales_partner else 'nonpkp',
+                'npwp': sales_partner.npwp or '0',
+                'sppkp': sales_partner.sppkp,
+                'email': sales_partner.email,
+                'user_id': 11314
+            }
+            _logger.info(f"Order parameters: {parameters}")
+
+            sales_partner = request.env['res.partner'].browse(parameters['partner_id'])
+            if sales_partner and sales_partner.user_id and sales_partner.user_id.id not in [25]:
+                parameters['user_id'] = sales_partner.user_id.id
+                _logger.info(f"Updated user_id from partner: {parameters['user_id']}")
+
+            if params['value']['type'] == 'sale_order':
+                parameters['approval_status'] = 'pengajuan1'
+                _logger.info("Setting approval_status to 'pengajuan1'")
+
+            sale_order = request.env['sale.order'].with_context(from_website_checkout=True).create([parameters])
+            sale_order.onchange_partner_contact()
+            _logger.info(f"Created SO: {sale_order.id} - {sale_order.name}")
+
+            user_id = params['value']['user_id']
+            user_cart = request.env['website.user.cart']
+            source = params['value']['source']
+            _logger.info(f"Getting cart for user: {user_id}, source: {source}")
+
+            carts = user_cart.get_product_by_user(user_id=user_id, selected=True, source=source)
+            _logger.info(f"Found {len(carts)} cart items")
+
+            promotions = []
+            for idx, cart in enumerate(carts, 1):
+                _logger.info(f"\n=== Processing Cart Item {idx}/{len(carts)} ===")
+                _logger.info(f"Full cart data: {cart}")
+
+                if cart['cart_type'] == 'product':
+                    product = request.env['product.product'].browse(cart['id'])
+                    _logger.info(f"Product: {product.id} - {product.name}")
+                    _logger.info(f"Cart Price Data: {cart['price']}")
+
+                    # Determine discount status based on:
+                    # 1. has_flashsale flag from cart data
+                    # 2. discount percentage > 0
+                    # 3. global flash sale parameter
+                    is_flash_sale_item = cart.get('has_flashsale', False)
+                    discount_percent = float(cart['price'].get('discount_percentage', 0))
+                    global_flash_sale = params['value'].get('flash_sale', False)
+
+                    is_has_disc = False
+
+                    # Item is considered discounted if:
+                    # - It's specifically marked as flash sale item, OR
+                    # - It has significant discount (>0%) and not affected by global flash sale
+                    if is_flash_sale_item:
+                        is_has_disc = True
+                        _logger.info("Item is flash sale product - marked as discounted")
+                    elif discount_percent > 0 and not global_flash_sale:
+                        is_has_disc = True
+                        _logger.info(f"Item has discount {discount_percent}% - marked as discounted")
+                    elif global_flash_sale:
+                        _logger.info("Global flash sale active but item not eligible - not marked as discounted")
+
+                    _logger.info(f"Final is_has_disc: {is_has_disc}")
+
+                    order_line = request.env['sale.order.line'].create({
+                        'company_id': 1,
+                        'order_id': sale_order.id,
+                        'product_id': product.id,
+                        'product_uom_qty': cart['quantity'],
+                        'product_available_quantity': cart['available_quantity'],
+                        'price_unit': cart['price']['price'],
+                        'discount': discount_percent,
+                        'is_has_disc': is_has_disc
+                    })
+                    _logger.info(f"Created order line: {order_line.id}")
+
+                    order_line.product_id_change()
+                    order_line.weight = order_line.product_id.weight
+                    order_line.onchange_vendor_id()
+                    _logger.info(f"After onchanges - Price: {order_line.price_unit}, Disc: {order_line.discount}")
+
+                elif cart['cart_type'] == 'promotion':
+                    promotions.append({
+                        'order_id': sale_order.id,
+                        'program_line_id': cart['id'],
+                        'quantity': cart['quantity']
+                    })
+                    _logger.info(f"Added promotion: {cart['id']}")
+
+            _logger.info("Processing promotions...")
+            sale_order._compute_etrts_date()
+            request.env['sale.order.promotion'].create(promotions)
+
+            if len(promotions) > 0:
+                _logger.info(f"Applying {len(promotions)} promotions")
+                sale_order.apply_promotion_program()
+                sale_order.add_free_product(promotions)
+
+            voucher_code = params['value']['voucher']
+            if voucher_code:
+                _logger.info(f"Processing voucher: {voucher_code}")
+                voucher = request.env['voucher'].search(
+                    [('code', '=', voucher_code), ('apply_type', 'in', ['all', 'brand'])], limit=1)
+                voucher_shipping = request.env['voucher'].search(
+                    [('code', '=', voucher_code), ('apply_type', 'in', ['shipping'])], limit=1)
+
+                if voucher and len(promotions) == 0:
+                    _logger.info("Applying regular voucher")
+                    sale_order.voucher_id = voucher.id
+                    sale_order.apply_voucher()
+
+                if voucher_shipping and len(promotions) == 0:
+                    _logger.info("Applying shipping voucher")
+                    sale_order.voucher_shipping_id = voucher_shipping.id
+                    sale_order.apply_voucher_shipping()
+
+            cart_ids = [x['cart_id'] for x in carts]
+            if sale_order._requires_approval_margin_leader():
+                sale_order.approval_status = 'pengajuan2'
+                _logger.info("Approval status set to 'pengajuan2'")
+            elif sale_order._requires_approval_margin_manager():
+                sale_order.approval_status = 'pengajuan1'
+                _logger.info("Approval status set to 'pengajuan1'")
+
+            sale_order._auto_set_shipping_from_website()
+            _logger.info("=== END CREATE PARTNER SALE ORDER ===")
+            return self.response({
+                'id': sale_order.id,
+                'name': sale_order.name
+            })
+
+        except Exception as e:
+            _logger.error(f"Error in create_partner_sale_order: {str(e)}", exc_info=True)
+            return self.response(code=500, description=str(e))
     
     @http.route(PREFIX_PARTNER + 'sale-order/<id>/awb', auth='public', methods=['GET', 'OPTIONS'])
     @controller.Controller.must_authorized(private=True, private_key='partner_id')
diff --git a/indoteknik_api/controllers/api_v1/voucher.py b/indoteknik_api/controllers/api_v1/voucher.py
index 9ffeeace..0338360b 100644
--- a/indoteknik_api/controllers/api_v1/voucher.py
+++ b/indoteknik_api/controllers/api_v1/voucher.py
@@ -74,7 +74,7 @@ class Voucher(controller.Controller):
 
             partner_voucher_orders = []
             for order in voucher.order_ids:
-                if order.partner_id.id == user.partner_id.id:
+                if order.partner_id.id == user.partner_id.id and order.state != 'cancel' and (order.payment_status or order.payment_status is None):
                     partner_voucher_orders.append(order)
             
             if voucher.limit_user > 0 and len(partner_voucher_orders) >= voucher.limit_user: