Merge branch 'adminbsb_material_ui'

app/controllers/origami/home_controller.rb

@@ -129,6 +129,18 @@ class Origami::HomeController < BaseOrigamiController
     end
   end
 
+def check_emp_access_code
+  pin_code = params[:code]
+  employee = Employee.find_by_emp_id(pin_code)
+  if employee && employee.role == "manager"
+   result = {:status=> true, :message=>"Success" }
+  else
+    result = {:status=> false, :message=>"Invalid Access Code" }
+  end
+  render :json => result.to_json
+
+end
+
 private
 
 def set_dining

app/controllers/origami/payments_controller.rb

@@ -446,8 +446,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
       
       saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
-      puts "FOC"
-      puts saleObj.to_json
+
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)
       # For Cashier by Zone

app/controllers/origami/sale_edit_controller.rb

@@ -17,6 +17,7 @@ class Origami::SaleEditController < BaseOrigamiController
   def item_void
     saleitemId = params[:sale_item_id]
     remark     = params[:remark]
+    access_code = params[:access_code]
     saleitemObj = SaleItem.find(saleitemId)
     saleitemObj.status = 'void'
     saleitemObj.remark = remark
@@ -48,8 +49,9 @@ class Origami::SaleEditController < BaseOrigamiController
       end
     end
     action_by = current_user.id
+    approved_by = Employee.find_by_emp_id(access_code)
     remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
-    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" )
+    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, approved_by.name,remark,"SALEITEMVOID" )
 
     saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount)
     ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
@@ -58,6 +60,7 @@ class Origami::SaleEditController < BaseOrigamiController
   def item_foc
     saleitemId = params[:sale_item_id]
     remark     = params[:remark]
+    access_code = params[:access_code]
     saleitemObj = SaleItem.find(saleitemId)
     saleitemObj.status = 'foc'
     saleitemObj.remark = remark
@@ -80,8 +83,9 @@ class Origami::SaleEditController < BaseOrigamiController
     order = Order.find(order_id)
 
     action_by = current_user.id
+    approved_by = Employee.find_by_emp_id(access_code)
     remark = "FOC Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}Receipt No #{saleObj.receipt_no}"
-    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMFOC" )
+    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, approved_by.name,remark,"SALEITEMFOC" )
 
     saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source)
     ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
@@ -111,6 +115,7 @@ class Origami::SaleEditController < BaseOrigamiController
     saleitemId = params[:sale_item_id]
     update_qty = params[:update_qty]
     update_price = params[:update_price]
+    access_code = params[:access_code]
     saleitemObj = SaleItem.find(saleitemId)
     sale        = Sale.find(saleitemObj.sale_id)
 
@@ -120,8 +125,9 @@ class Origami::SaleEditController < BaseOrigamiController
     saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
 
     action_by = current_user.id
+    approved_by = Employee.find_by_emp_id(access_code)
     remark = "Update Qty #{update_qty} Price [#{saleitemObj.price}]| Receipt No #{sale.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
-    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,sale.cashier_id, action_by,remark,"SALEITEMEDIT" )
+    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,sale.cashier_id, approved_by.name,remark,"SALEITEMEDIT" )
     # saleitemObj.remark        = 'edit'
 
     unless saleitemObj.product_name.include? 'updated'
@@ -152,6 +158,7 @@ class Origami::SaleEditController < BaseOrigamiController
   # make cancel void item
   def item_void_cancel
     saleitemId = params[:sale_item_id]
+    access_code = params[:access_code]
     saleitemObj = SaleItem.find(saleitemId)
     both = SaleItem.where('product_code=?', saleitemObj.product_code)
     both.each do |item|
@@ -169,8 +176,9 @@ class Origami::SaleEditController < BaseOrigamiController
     order = Order.find(order_id)
 
     action_by = current_user.id
+    approved_by = Employee.find_by_emp_id(access_code)
     remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}"
-    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"ITEMCANCELVOID" )
+    sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, approved_by.name,remark,"ITEMCANCELVOID" )
 
     saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order.source)
     ProductCommission.remove_product_commission(saleitemObj)

app/controllers/origami/void_controller.rb

@@ -5,6 +5,7 @@ class Origami::VoidController < BaseOrigamiController
     sale_id = params[:sale_id]
     remark  = params[:remark]
     order_source = params[:type] #tax profile source
+    access_code = params[:access_code]
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
 
@@ -71,8 +72,9 @@ class Origami::VoidController < BaseOrigamiController
 
       # FOr Sale Audit 
       action_by = current_user.name
+      approved_by = Employee.find_by_emp_id(access_code)
       # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
-      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" )
+      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,"SALEVOID" )
 
       # For Print 
 

app/controllers/origami/waste_spoile_controller.rb

@@ -3,7 +3,8 @@ class Origami::WasteSpoileController < BaseOrigamiController
 
     sale_id = params[:sale_id]
     remark  = params[:remark]
-    order_source = params[:type] #tax profile source
+    order_source = params[:type]
+    access_code = params[:access_code] #tax profile source
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
       SaleTax.where("sale_id='#{sale_id}'").find_each do |existing_tax|
@@ -54,8 +55,9 @@ class Origami::WasteSpoileController < BaseOrigamiController
 
       # FOr Sale Audit 
       action_by = current_user.name
+      approved_by = Employee.find_by_emp_id(access_code)
       # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
-      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,remark )
+      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,remark )
 
       # For Print