diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-04-28 16:26:16 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-04-28 16:26:16 +0700 |
| commit | f704fbd43aac910fb5b2023ad2d61eac918acebc (patch) | |
| tree | 2a78ed4af3874965e721b22e323896ba612c9fc7 /indoteknik_api/controllers/api_v1 | |
| parent | 5eddde4da5740afa752ce997d5c95b43b4131218 (diff) | |
| parent | 0eba3c4c50ecda45e90ba5e8199afd30fe4a6214 (diff) | |
Merge branch 'release' of bitbucket.org:altafixco/indoteknik-addons into release
Diffstat (limited to 'indoteknik_api/controllers/api_v1')
| -rw-r--r-- | indoteknik_api/controllers/api_v1/flash_sale.py | 1 | ||||
| -rw-r--r-- | indoteknik_api/controllers/api_v1/sale_order.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indoteknik_api/controllers/api_v1/flash_sale.py b/indoteknik_api/controllers/api_v1/flash_sale.py index a0aaa44e..dc7c3928 100644 --- a/indoteknik_api/controllers/api_v1/flash_sale.py +++ b/indoteknik_api/controllers/api_v1/flash_sale.py @@ -27,6 +27,7 @@ class FlashSale(controller.Controller): 'name': pricelist.name, 'banner': request.env['ir.attachment'].api_image('product.pricelist', 'banner', pricelist.id), 'banner_mobile': request.env['ir.attachment'].api_image('product.pricelist', 'banner_mobile', pricelist.id), + 'banner_top': request.env['ir.attachment'].api_image('product.pricelist', 'banner_top', pricelist.id), 'duration': round((pricelist.end_date - datetime.now()).total_seconds()), 'product_total': request.env['product.pricelist.item'].search_count(query), }) diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 425dd296..18004175 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -65,9 +65,9 @@ class SaleOrder(controller.Controller): context = params['value']['context'] if context == 'quotation': - domain += [('approval_status', '=', False)] + domain += ["|","|",("state","=","draft"),("state","=","sent"),("state","=","cancel")] if not context: - domain += [('approval_status', '!=', False)] + domain += ["|",("state","=","sale"),("state","=","done")] if params['value']['name']: name = params['value']['name'].replace(' ', '%') |