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

2 files changed, 26 insertions, 3 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 90dee56c..f2ec8dfe 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -7,6 +7,21 @@ class SaleOrder(controller.Controller):
     prefix = '/api/v1/'
     PREFIX_PARTNER = prefix + 'partner/<partner_id>/'
 
+    @http.route(prefix + "sale_order_number", auth='public', method=['GET', 'OPTIONS'])
+    def get_number_sale_order(self, **kw):
+        user_token = self.authenticate()
+        if not user_token:
+            return self.unauthorized_response()
+
+        sale_order_id = int(kw.get('sale_order_id', '0'))
+        sale_number = str(kw.get('sale_number', ''))
+        if sale_order_id > 0:
+            sales = request.env['sale.order'].search_read([('id', '=', sale_order_id)], fields=['id', 'name', 'amount_total', 'state'])
+        else:
+            sales = request.env['sale.order'].search_read([('name', '=', sale_number)], fields=['id', 'name', 'amount_total', 'state'])
+
+        return self.response(sales)
+
     @http.route(PREFIX_PARTNER + 'sale_order', auth='public', method=['GET', 'OPTIONS'])
     def get_partner_sale_order(self, **kw):
         user_token = self.authenticate() 
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 0b9d1f44..b88d9ad0 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -53,11 +53,19 @@ class SaleOrder(models.Model):
     partner_purchase_order_description = fields.Text(string='Keterangan PO Customer', copy=False, help="Keterangan purchase order customer, diisi oleh customer melalui website.", tracking=3)
     partner_purchase_order_file = fields.Binary(string='File PO Customer', copy=False, help="File purchase order customer, diisi oleh customer melalui website.")
     payment_status = fields.Selection([
-        ('confirm', 'Menunggu Konfirmasi'),
         ('pending', 'Pending'),
-        ('lunas', 'Lunas'),
+        ('capture', 'Capture'),
+        ('settlement', 'Settlement'),
+        ('deny', 'Deny'),
         ('cancel', 'Cancel'),
-    ], string='Payment Status', help='Payment Gateway Status / Midtrans / Web')
+        ('expire', 'Expire'),
+        ('failure', 'Failure'),
+        ('refund', 'Refund'),
+        ('chargeback', 'Chargeback'),
+        ('partial_refund', 'Partial Refund'),
+        ('partial_chargeback', 'Partial Chargeback'),
+        ('authorize', 'Authorize'),
+    ], string='Payment Status', help='Payment Gateway Status / Midtrans / Web, https://docs.midtrans.com/en/after-payment/status-cycle')
 
     def calculate_so_status_beginning(self):
         so_state = ['sale']