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

4 files changed, 46 insertions, 2 deletions

diff --git a/indoteknik_api/controllers/api_v1/__init__.py b/indoteknik_api/controllers/api_v1/__init__.py
index a4776503..ab499443 100644
--- a/indoteknik_api/controllers/api_v1/__init__.py
+++ b/indoteknik_api/controllers/api_v1/__init__.py
@@ -18,3 +18,4 @@ from . import wishlist
 from . import brand_homepage
 from . import customer
 from . import content
+from . import midtrans
diff --git a/indoteknik_api/controllers/api_v1/midtrans.py b/indoteknik_api/controllers/api_v1/midtrans.py
new file mode 100644
index 00000000..fdc801d3
--- /dev/null
+++ b/indoteknik_api/controllers/api_v1/midtrans.py
@@ -0,0 +1,42 @@
+from .. import controller
+from odoo import http
+from odoo.http import request
+import json
+
+
+class Midtrans(controller.Controller):
+    prefix = '/api/v1/'
+
+    @http.route(prefix + 'midtrans/notification', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS'])
+    def notification(self, **kw):
+        json_raw = json.loads(request.httprequest.data)
+        trx_status = json.loads(request.httprequest.data)['transaction_status']
+        order_no = json.loads(request.httprequest.data)['order_id']
+
+        query = [('name', '=', order_no)]
+        order = request.env['sale.order'].sudo().search(query, limit=1)
+        order.payment_status = trx_status
+
+        request.env['midtrans.notification'].create([{
+            'sale_order_id': order.id,
+            'json_raw': json_raw,
+            'payment_status': trx_status,
+        }])
+
+        return
+
+    @http.route(prefix + 'midtrans/recurring', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS'])
+    def recurring(self, **kw):
+        json_raw = json.loads(request.httprequest.data)
+        request.env['midtrans.recurring'].create([{
+            'json_raw': json_raw,
+        }])
+        return
+
+    @http.route(prefix + 'midtrans/payaccount', auth='none', type='json', csrf=False, cors='*', methods=['POST', 'OPTIONS'])
+    def payaccount(self, **kw):
+        json_raw = json.loads(request.httprequest.data)
+        request.env['midtrans.account'].create([{
+            'json_raw': json_raw,
+        }])
+        return
\ No newline at end of file
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 47cb2d59..7ce8cd43 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -127,7 +127,7 @@ class SaleOrder(controller.Controller):
             'partner_purchase_order_file': params['value']['po_file']
         }
         sale_order = request.env['sale.order'].create([[parameters]])
-
+        var = json.loads(kw.get('transaction_time', '{}'))
         order_line = json.loads(params['value']['order_line'])
         parameters = []
         for line in order_line:
diff --git a/indoteknik_api/models/blog_post.py b/indoteknik_api/models/blog_post.py
index 2a82c23c..079181e2 100644
--- a/indoteknik_api/models/blog_post.py
+++ b/indoteknik_api/models/blog_post.py
@@ -9,7 +9,8 @@ class BlogPost(models.Model):
         base_url = self.env['ir.config_parameter'].get_param('web.base.url')
         data = {
             'id': blog.id,
-            'thumbnail': base_url + 'api/image/blog.post/thumbnail/' + str(blog.id) if blog.thumbnail else '',
+            # 'thumbnail': base_url + 'api/image/blog.post/thumbnail/' + str(blog.id) if blog.thumbnail else '',
+            'thumbnail': self.env['ir.attachment'].api_image('blog.post', 'thumbnail', blog.id),
             'title': blog.name,
             'category': {},
             'author': {},