From f4116fe9fbb6a40ac3f639d559e576d35d20b500 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 30 Nov 2017 18:12:48 +0630
Subject: [PATCH] oqs edit

---
 app/models/sale.rb                |  3 +--
 app/views/oqs/edit/index.html.erb |  8 +++++++-
 config/license.yml                | 12 ++++++++++++
 config/secrets.yml                |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 config/license.yml

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 48fbdc9b..4b2acadc 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -521,8 +521,7 @@ def self.daily_sales_list(from,to)
      SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
      SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount,
      SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
-  .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id")
-  # .where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0", 'completed', from, to)
+  .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id")  
   .where("sale_status = ? AND sales.receipt_date between ? and ? ", 'completed', from, to)
   .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')")
 
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 0cae40ce..750a04c8 100755
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -98,10 +98,16 @@
 
 <script type="text/javascript">
 $(document).ready(function(){
-  // Qty update for OQS Edit Controller
   original_value = $('#qty').val();
+
+  // Qty update for OQS Edit Controller
   $('#qty-update').on('click', function(){
     var qty_weight = $("input[name='qty_weight']").val();
+    if(qty_weight > original_value){      
+      swal("Alert!", "Not allowed over quantity", "warning");
+      return;
+    }
+    
     var remarks = $("textarea[name='remarks']").val();
     var order_items_id = $(this).attr('data-id');
     var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
diff --git a/config/license.yml b/config/license.yml
new file mode 100644
index 00000000..97dacb2c
--- /dev/null
+++ b/config/license.yml
@@ -0,0 +1,12 @@
+iv_key: ot/9kJvrexQvsXjWoUH+Dg==
+shop_name: 32M23m+24HjueByPEwL8WA==
+email: yanaung.nyein@code2lab.com
+telephone: 111111
+fax: 111111
+address: bitp
+dbhost: knPMTeN0zDmun8r6BrWRMw==
+dbschema: 3nmnb3SzCZx3lbCR1CjhLg==
+dbusername: v7q47v3/lwDh3jRqQMNX
+dbpassword: WUol9DpKS50foOM8q1XgIw==
+api_token: nGyMizHtoVEFYCjSVEFJuzkxuBJwSsH
+app_token: QUdPwSakcsnuVLdfkXgGHhPMiIOcSSfaVwQyA
diff --git a/config/secrets.yml b/config/secrets.yml
index 4aa61932..f8456ee3 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: 192.168.1.147:3002/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
   aes_key: <%= ENV['AES_KEY'] %>