git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oqs edit

Browse Source
This commit is contained in:
Yan
2017-11-30 18:12:48 +06:30
parent 7552bbeefe
commit f4116fe9fb
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/sale.rb
View File

@@ -522,7 +522,6 @@ def self.daily_sales_list(from,to)
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='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") 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") .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)
.where("sale_status = ? AND sales.receipt_date between ? and ? ", 'completed', from, to) .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')") .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')")

8
app/views/oqs/edit/index.html.erb
View File

@@ -98,10 +98,16 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
// Qty update for OQS Edit Controller
original_value = $('#qty').val(); original_value = $('#qty').val();
// Qty update for OQS Edit Controller
$('#qty-update').on('click', function(){ $('#qty-update').on('click', function(){
var qty_weight = $("input[name='qty_weight']").val(); 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 remarks = $("textarea[name='remarks']").val();
var order_items_id = $(this).attr('data-id'); var order_items_id = $(this).attr('data-id');
var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks } var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }

12
config/license.yml Normal file
View File

@@ -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

2
config/secrets.yml
View File

@@ -13,7 +13,7 @@
development: development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
sx_provision_url: 192.168.1.147:3002/api #provision.zsai.ws/api sx_provision_url: 192.168.1.147:3002/api #provision.zsai.ws/api
server_mode: cloud server_mode: application
cipher_type: AES-256-CBC cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L sx_key: Wh@t1$C2L
aes_key: <%= ENV['AES_KEY'] %> aes_key: <%= ENV['AES_KEY'] %>