diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2024-01-04 09:25:14 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2024-01-04 09:25:14 +0700 |
| commit | 717cb3b43c729e265603b3df61234c0b430742a7 (patch) | |
| tree | 96b5547e395fc8cef46d679cbf4afee7d7dd729c /indoteknik_custom/models/promotion | |
| parent | ad127a4dc2bfb81d9c99ba78ab41a49eefeb0dd2 (diff) | |
update promotion program feature
Diffstat (limited to 'indoteknik_custom/models/promotion')
| -rw-r--r-- | indoteknik_custom/models/promotion/promotion_program.py | 1 | ||||
| -rw-r--r-- | indoteknik_custom/models/promotion/promotion_program_line.py | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indoteknik_custom/models/promotion/promotion_program.py b/indoteknik_custom/models/promotion/promotion_program.py index 29aaa753..1a1ee6bf 100644 --- a/indoteknik_custom/models/promotion/promotion_program.py +++ b/indoteknik_custom/models/promotion/promotion_program.py @@ -6,6 +6,7 @@ class PromotionProgram(models.Model): name = fields.Char(string="Name") banner = fields.Binary(string="Banner") + image = fields.Binary(string="Image") icon = fields.Binary(string="Icon", help="Image 1:1 ratio") icon_top = fields.Binary(string="Icon Top", help="Icon ini ditampilkan sebagai atribut pada atas gambar di product card pada website") icon_bottom = fields.Binary(string="Icon Bottom", help="Icon ini ditampilkan sebagai atribut pada bawah gambar di product card pada website") diff --git a/indoteknik_custom/models/promotion/promotion_program_line.py b/indoteknik_custom/models/promotion/promotion_program_line.py index d9095c75..d77123ce 100644 --- a/indoteknik_custom/models/promotion/promotion_program_line.py +++ b/indoteknik_custom/models/promotion/promotion_program_line.py @@ -13,7 +13,6 @@ class PromotionProgramLine(models.Model): ("discount_loading", "Discount Loading"), ("merchandise", "Merchandise") ], 'Type') - image = fields.Binary(string="Image") package_limit = fields.Integer('Package limit') package_limit_user = fields.Integer('Package limit / user') @@ -96,15 +95,15 @@ class PromotionProgramLine(models.Model): weight = 0 if not any(x['package_weight'] == 0 for x in merged_products): weight = sum(x['package_weight'] for x in merged_products) - - products_total = sum(x['price']['price_discount'] * x['qty'] for x in products) - free_products_total = sum(x['price']['price_discount'] * x['qty'] for x in free_products) + + # Sum of products and free products in 1 package quantity + products_total = sum(x['price']['price_discount'] * x['qty'] / qty for x in products) + free_products_total = sum(x['price']['price_discount'] * x['qty'] / qty for x in free_products) package_price = products_total + free_products_total response = { 'id': self.id, 'name': self.name, - 'image': ir_attachment.api_image(self._name, 'image', self.id), 'remaining_time': self._get_remaining_time(), 'promotion_type': self._res_promotion_type(), 'limit_qty': limit_qty, |