Merge branch 'production' of bitbucket.org:altafixco/indoteknik-addons into production

1 files changed, 19 insertions, 10 deletions

diff --git a/indoteknik_api/controllers/api_v1/voucher.py b/indoteknik_api/controllers/api_v1/voucher.py
index 3c056ecd..53f118ec 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/<user_id>/voucher', auth='public', methods=['GET', 'OPTIONS'])
+    @http.route(PREFIX_API + 'user/<user_id>/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']
 
@@ -35,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'],