From ba4ec71ec97537a79c09e220fd3eda60d3017983 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 10:21:30 +0630
Subject: [PATCH 01/15] updated origami js

---
 app/assets/javascripts/orgiami.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/orgiami.js
index 92bdcbf3..20ac5b26 100644
--- a/app/assets/javascripts/orgiami.js
+++ b/app/assets/javascripts/orgiami.js
@@ -145,7 +145,7 @@ $(document).ready(function(){
 	// Payment for Bill
 	$('#pay').click(function() {
 		var sale_id=$(".selected-item").find(".orders-id").text();
-		if(order_id!=""){
+		if(sale_id!=""){
 			window.location.href = '/origami/sale/'+ sale_id  + "/payment"
 		}
 		else {

From 015222b5753a4b5aacca9bab40e1b986bb58578c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 10:22:55 +0630
Subject: [PATCH 02/15] changed orgirami to origami

---
 app/assets/javascripts/{orgiami.js => origami.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/assets/javascripts/{orgiami.js => origami.js} (100%)

diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/origami.js
similarity index 100%
rename from app/assets/javascripts/orgiami.js
rename to app/assets/javascripts/origami.js

From 1d472aa2e1a7df2ec7e0bf8947934ca7c3edfce7 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 10:26:06 +0630
Subject: [PATCH 03/15] add req bill seed

---
 db/seeds.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/seeds.rb b/db/seeds.rb
index 66ded4f3..fc19164d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -142,6 +142,7 @@ beverage = Account.create({title: "Beverage", account_type: "1"})
 
 order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"})
 order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"})
+request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"})
 
 # shop = Shop.create(
 #   {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", 

From 39c20b221ec4074657cdb63def3c695fc35b5c31 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 10:35:19 +0630
Subject: [PATCH 04/15] updated miss origami css and js filename

---
 app/assets/stylesheets/orgiami.scss      | 78 ------------------------
 app/views/layouts/origami.html.erb       |  4 +-
 app/views/origami/payments/show.html.erb |  2 +-
 3 files changed, 3 insertions(+), 81 deletions(-)
 delete mode 100644 app/assets/stylesheets/orgiami.scss

diff --git a/app/assets/stylesheets/orgiami.scss b/app/assets/stylesheets/orgiami.scss
deleted file mode 100644
index 0be16266..00000000
--- a/app/assets/stylesheets/orgiami.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-@import "bootstrap";
-@import "font-awesome";
-@import "theme";
-
-/* Show it is fixed to the top */
-// body {
-//   min-height: 75rem;
-//   padding-top: 4.5rem;
-// }
-
-.cashier_number{
-	height:76px;
-	line-height:80px;
-	text-align:center;
-	background:#54A5AF;
-	float:left;
-	margin:2px;
-	font-size:20px;
-	color:white;
-	cursor:pointer;
-}
-
-.cashier_number:hover{
-	background:#A9F5F2;
-}
-
-.long{
-	width:100%
-}
-
-.sold {
-	background-color: red;
-}
-
-.selected-item {
-	background-color: blue;
-}
-
-/* Reciept Style */
-#order-charges-table td {
-	border-top: none !important;
-}
-
-.charges-name {
-	width: 80%; 
-	text-align: left;
-}
-
-.item-name {
-	width: 60%; 
-	text-align: left;
-}
-
-.item-attr {
-	width: 20%; 
-	text-align: right;
-}
-
-
-/* Colors */
-.purple {
-	background-color:#7a62d3;
-}
-
-.red {
-	background-color:#ff0000;
-}
-
-.green{
-	background-color: #009900
-}
-
-
-/*----- Reset -----*/
-
-select.form-control {
-  height: inherit !important;
-}
diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb
index 2c438597..ef5f3789 100644
--- a/app/views/layouts/origami.html.erb
+++ b/app/views/layouts/origami.html.erb
@@ -9,8 +9,8 @@
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
 
-    <%= stylesheet_link_tag    'orgiami', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'orgiami', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'origami', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %>
   </head>
 
   <body>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index fcdee809..c2c15787 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -165,7 +165,7 @@
 
 <script>
 $(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
+        //event.stopPropagation();
         event.preventDefault();
         if(event.handled !== true) {
             var original_value;

From 54ef7014820cf2283e82ec8c51bff5037aae0c5c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 10:36:07 +0630
Subject: [PATCH 05/15] updated miss origami css and js filename

---
 app/assets/stylesheets/origami.scss | 78 +++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 app/assets/stylesheets/origami.scss

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
new file mode 100644
index 00000000..0be16266
--- /dev/null
+++ b/app/assets/stylesheets/origami.scss
@@ -0,0 +1,78 @@
+@import "bootstrap";
+@import "font-awesome";
+@import "theme";
+
+/* Show it is fixed to the top */
+// body {
+//   min-height: 75rem;
+//   padding-top: 4.5rem;
+// }
+
+.cashier_number{
+	height:76px;
+	line-height:80px;
+	text-align:center;
+	background:#54A5AF;
+	float:left;
+	margin:2px;
+	font-size:20px;
+	color:white;
+	cursor:pointer;
+}
+
+.cashier_number:hover{
+	background:#A9F5F2;
+}
+
+.long{
+	width:100%
+}
+
+.sold {
+	background-color: red;
+}
+
+.selected-item {
+	background-color: blue;
+}
+
+/* Reciept Style */
+#order-charges-table td {
+	border-top: none !important;
+}
+
+.charges-name {
+	width: 80%; 
+	text-align: left;
+}
+
+.item-name {
+	width: 60%; 
+	text-align: left;
+}
+
+.item-attr {
+	width: 20%; 
+	text-align: right;
+}
+
+
+/* Colors */
+.purple {
+	background-color:#7a62d3;
+}
+
+.red {
+	background-color:#ff0000;
+}
+
+.green{
+	background-color: #009900
+}
+
+
+/*----- Reset -----*/
+
+select.form-control {
+  height: inherit !important;
+}

From 56a6d84abee8ffb0e43957807e19ccda68fdfe65 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 9 Jun 2017 10:57:16 +0630
Subject: [PATCH 06/15] Update

---
 Gemfile      | 4 ++--
 Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index fe865876..da3af1e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'rails', '~> 5.1.0'
 #gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
-#gem 'pg'
+gem 'pg'
 
 # redis server for cable
 # gem 'redis', '~> 3.0'
@@ -94,4 +94,4 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'httparty', '~> 0.15.5'
 
-gem 'bootstrap-datepicker-rails'
\ No newline at end of file
+gem 'bootstrap-datepicker-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index fbf61a33..2c4c94b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,6 +123,7 @@ GEM
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     pdf-core (0.7.0)
+    pg (0.20.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
@@ -258,7 +259,6 @@ DEPENDENCIES
   kaminari!
   listen (~> 3.0.5)
   pg
-  mysql2 (>= 0.3.18, < 0.5)
   prawn
   prawn-table
   puma (~> 3.0)

From 9771ed2019aafb3ce58bbf09a5f5a310a534df5c Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 11:03:14 +0630
Subject: [PATCH 07/15] add report in menu

---
 app/views/layouts/_header.html.erb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 47c10ac9..4cea13e2 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -20,6 +20,7 @@
               <li><%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
+              <li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
 
@@ -30,9 +31,14 @@
             <li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
-        <!-- <li class="navbar-nav mr-auto">
-          Reports
-        </li> -->
+        <li class="navbar-nav mr-auto">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Reports</a>
+          <ul class="dropdown-menu">
+            <li><%= link_to "Daily Sale Report", origami_root_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Sales Item Report", origami_root_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Receipt Report", origami_root_path, :tabindex =>"-1" %></li>
+          </ul>
+        </li>
      </ul>
 
    </div>

From 6171b00dc7ed22a4feb49090326f8ecaeb8bbef6 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 9 Jun 2017 11:25:30 +0630
Subject: [PATCH 08/15] cash payment complete

---
 Gemfile.lock                                   |  1 -
 app/controllers/origami/payments_controller.rb |  2 +-
 app/models/sale_payment.rb                     | 17 ++++++++---------
 app/views/origami/payments/show.html.erb       | 11 +++++++----
 config/initializers/assets.rb                  |  6 +++---
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 520eb9c8..051e1595 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,6 @@ DEPENDENCIES
   jquery-rails
   kaminari (~> 0.16.3)
   listen (~> 3.0.5)
-
   mysql2 (>= 0.3.18, < 0.5)
   pg
   prawn
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index bac414ad..c60efdac 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -10,7 +10,7 @@ class Origami::PaymentsController < BaseOrigamiController
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash)
+      sale_payment.process_payment(saleObj, @user, cash, "cash")
     end
   end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 834dba1f..d8aa1cee 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -8,7 +8,7 @@ class SalePayment < ApplicationRecord
 
   attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
 
-  def process_payment(invoice, action_by, cash_amount,payment_method)
+  def process_payment(invoice, action_by, cash_amount, payment_method)
 
     self.sale = invoice
     self.received_amount = cash_amount
@@ -75,7 +75,7 @@ class SalePayment < ApplicationRecord
                 }
           )
         return response;
-      
+
   end
 
   def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id)
@@ -93,9 +93,9 @@ class SalePayment < ApplicationRecord
       else
         response =false;
       end
-      
+
       return response;
-      
+
   end
 
   private
@@ -103,7 +103,7 @@ class SalePayment < ApplicationRecord
     payment_status = false
     self.payment_method = "cash"
     self.payment_amount = self.received_amount
-    self.outstanding_amount = self.sale.grand_total - self.received_amount
+    self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
 
@@ -195,11 +195,10 @@ class SalePayment < ApplicationRecord
     if membership_data["status"]==true
       SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
       sale_update_payment_status(self.received_amount.to_f)
-      
+
     else
       sale_update_payment_status(0)
     end
-    
 
     return payment_status
 
@@ -207,9 +206,9 @@ class SalePayment < ApplicationRecord
 
   def sale_update_payment_status(paid_amount)
     #update amount_outstanding
-    self.sale.amount_received =   self.sale.amount_received + paid_amount
+    self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
     self.sale.amount_changed = paid_amount - self.sale.amount_received
-    if (self.sale.grand_total <=   self.sale.amount_received && self.sale.amount_changed > 0)
+    if (self.sale.grand_total <=   self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
       self.sale.save!
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c2c15787..cb031eb3 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -165,14 +165,17 @@
 
 <script>
 $(document).on('click', '.cashier_number', function(event){
-        //event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
+        //
+        // event.stopPropagation();
+        // event.preventDefault();
+        console.log( event.handled );
+        if(event.handled == true) {
+
             var original_value;
             original_value = $('#cash').text();
 
             var input_type = $(this).attr("data-type");
-            
+
             switch (input_type) {
               case 'num':
               var input_value = $(this).attr("data-value");
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 6f563b42..c4069679 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -11,10 +11,10 @@ Rails.application.config.assets.version = '1.0'
 # Rails.application.config.assets.precompile += %w( search.js )
 
 # --- Waiter/ Cashier - Orgiami ----
-Rails.application.config.assets.precompile += %w( orgiami.css )
-Rails.application.config.assets.precompile += %w( orgiami.js )
+Rails.application.config.assets.precompile += %w( origami.css )
+Rails.application.config.assets.precompile += %w( origami.js )
 # -- Order Queue Station -----
 Rails.application.config.assets.precompile += %w( OQS.css )
-Rails.application.config.assets.precompile += %w( OQS.js ) 
+Rails.application.config.assets.precompile += %w( OQS.js )
 
 Rails.application.config.assets.precompile += %w( settings.css )

From fe60ac818f519e847aaa9e9f907d6decd19fc95d Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 11:33:21 +0630
Subject: [PATCH 09/15] update assets

---
 app/assets/javascripts/origami.js             |  81 ++++++-------
 app/assets/javascripts/origami/payment.js     | 113 ------------------
 app/assets/javascripts/origami/paypar.coffee  |   3 -
 .../javascripts/origami/request_bills.coffee  |   3 -
 app/assets/stylesheets/origami/paypar.scss    |   3 -
 .../stylesheets/origami/request_bills.scss    |   3 -
 app/views/origami/home/index.html.erb         |   4 +-
 app/views/origami/payments/show.html.erb      |  68 +++++------
 config/initializers/assets.rb                 |   4 +-
 9 files changed, 79 insertions(+), 203 deletions(-)
 delete mode 100644 app/assets/javascripts/origami/payment.js
 delete mode 100644 app/assets/javascripts/origami/paypar.coffee
 delete mode 100644 app/assets/javascripts/origami/request_bills.coffee
 delete mode 100644 app/assets/stylesheets/origami/paypar.scss
 delete mode 100644 app/assets/stylesheets/origami/request_bills.scss

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 20ac5b26..8ce3d0c4 100644
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -143,7 +143,7 @@ $(document).ready(function(){
 	});
 
 	// Payment for Bill
-	$('#pay').click(function() {
+	$('#pay-bill').click(function() {
 		var sale_id=$(".selected-item").find(".orders-id").text();
 		if(sale_id!=""){
 			window.location.href = '/origami/sale/'+ sale_id  + "/payment"
@@ -160,52 +160,53 @@ $(document).ready(function(){
 		window.location.href = '/crm/customers/'+ sale_id  + "/assign_sale_id"
 		return false;
 	});
-});
 
-/* For Receipt - Calculate discount or tax */
-$(document).on('click', '.cashier_number', function(event){
-    if(event.handled !== true) {
-        var original_value=0;
-        original_value = $('#discount-amount').val();
+	/* For Receipt - Calculate discount or tax */
+	$('.cashier_number').on('click', function(event){
+	    if(event.handled !== true) {
+	        var original_value=0;
+	        original_value = $('#discount-amount').val();
 
-        var input_type = $(this).attr("data-type");
-        
-        switch (input_type) {
-          case 'num':
-				var input_value = $(this).attr("data-value");
-				if (original_value == "0.0"){
-					$('#discount-amount').val(input_value);
+	        var input_type = $(this).attr("data-type");
+	        
+	        switch (input_type) {
+	          case 'num':
+					var input_value = $(this).attr("data-value");
+					if (original_value == "0.0"){
+						$('#discount-amount').val(input_value);
+						update_balance();
+					}
+					else{
+						$('#discount-amount').val(original_value + '' + input_value);
+						update_balance();
+					}				
+					break;
+
+	          case 'add':
+					var input_value = $(this).attr("data-value");
+					amount = parseInt(input_value) + parseInt(original_value);
+					$('#discount-amount').val(amount);
 					update_balance();
-				}
-				else{
-					$('#discount-amount').val(original_value + '' + input_value);
+					break;
+
+			  case 'del' :
+			  		var discount_text=$('#discount-amount').val();
+			  		$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));
 					update_balance();
-				}				
-				break;
+					break;
 
-          case 'add':
-				var input_value = $(this).attr("data-value");
-				amount = parseInt(input_value) + parseInt(original_value);
-				$('#discount-amount').val(amount);
-				update_balance();
-				break;
+	          case 'clr':
+	             $('#discount-amount').val("0.0");
+	             update_balance();
+	          break;
+			}
 
-		  case 'del' :
-		  		var discount_text=$('#discount-amount').val();
-		  		$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));
-				update_balance();
-				break;
+	      event.handled = true;
+	    } else {
+	        return false;
+	    }
+	});
 
-          case 'clr':
-             $('#discount-amount').val("0.0");
-             update_balance();
-          break;
-		}
-
-      event.handled = true;
-    } else {
-        return false;
-    }
 });
 
 /* Button Control by Status */
diff --git a/app/assets/javascripts/origami/payment.js b/app/assets/javascripts/origami/payment.js
deleted file mode 100644
index e21a369e..00000000
--- a/app/assets/javascripts/origami/payment.js
+++ /dev/null
@@ -1,113 +0,0 @@
-// $(document).on('touchstart click', '.keypad', function(event){
-//         event.stopPropagation();
-//         event.preventDefault();
-//         if(event.handled !== true) {
-//
-//             // Do your magic here.
-//             var input_value = $(this).attr("data-value");
-//             switch (input_value) {
-//
-//                 case 'delete':
-//                     process_delete_payment();
-//                     break;
-//
-//                 case 'foc':
-//                     remove_input_action();
-//                     $(".foc").attr("data-action","true");
-//                     if(customerName.toString() != " "){ //if already chosen customer
-//                         if($("#foc_reason_lists").attr("foc_reason") == ' '){
-//                             alert("Please! Choose or Add FOC reason");
-//                             foc_additional_form();
-//                         }
-//                         else{
-//                             process_foc_payment();
-//                         }
-//                     }
-//                     else{
-//                         alert("Please! Choose or Save Customer");
-//                         foc_additional_form();
-//                     }
-//                     break;
-//
-//                 case 'nett':
-//                     remove_input_action();
-//                     $(".nett").attr("data-action","true");
-//                     if($(".credit_note_payment").hasClass("payment_selected")){
-//                         if(customerName == " "){
-//                             alert("Please! Choose or Save Customer");
-//                             showCustomer();
-//                         }
-//                         else{
-//                             $("#accept_payment_btn").attr("data-payment","credit");
-//                             process_nett_payment();
-//                         }
-//                     }
-//                     else{
-//                             process_nett_payment();
-//                     }
-//                     break;
-//
-//                 case 'edit':
-//                     process_edit_invoice();
-//                     break;
-//
-//                 case 'cancel':
-//                     remove_input_action();
-//                     var status = $("#label_amountdue").attr("data-status");
-//                     if (status != 'completed' && status != 'void'){
-//                         $(".cancel").attr("data-action","true");
-//                         var message = confirm("Are you sure to void? Please, add reason!");
-//                         if (message == true) {
-//                             $(".additional_form").hide();
-//                             $("#void_sale_additional_form").show();
-//                             process_cancel_payment();
-//                         }
-//                     }
-//                     else{
-//                         $(".cancel").addClass("dim");
-//                     }
-//                     break;
-//
-//                 case 'ent':
-//                     amount_due = parseFloat($("#label_amountdue").attr("data-original"));
-//                     other_amt = parseFloat($("#label_cash_amount").attr("data-value"));
-//                     credit_amount = parseFloat($("#label_credit_note").text());
-//                     if ($(".credit_note_payment").hasClass("payment_selected") && credit_amount > 0){
-//                         if(customerName.toString() != " "){
-//                             if(credit_amount > (amount_due - other_amt)){
-//                                 alert("You shouldn't exceed the amount due.");
-//                             }
-//                             else{
-//                                 $("#accept_payment_btn").attr("data-payment","credit");
-//                                 update_balance_due();
-//                             }
-//                         }
-//                         else{
-//                             alert("Please! Choose or Save Customer");
-//                         }
-//                     }
-//                     else{
-//                         update_balance_due();
-//                     }
-//
-//                     break;
-//                 case 'clear':
-//                     process_clear_payment();
-//                     break;
-//
-//                 default:
-//
-//                     var existing_value = $(".payment_selected span").text();
-//
-//                     if (existing_value == "0" || existing_value == "0.00") { existing_value = ""; }
-//                     existing_value = existing_value + input_value;
-//                     $(".payment_selected span").text(existing_value);
-//
-//             }
-//
-//
-//             event.handled = true;
-//         } else {
-//             return false;
-//         }
-// });
diff --git a/app/assets/javascripts/origami/paypar.coffee b/app/assets/javascripts/origami/paypar.coffee
deleted file mode 100644
index 24f83d18..00000000
--- a/app/assets/javascripts/origami/paypar.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/origami/request_bills.coffee b/app/assets/javascripts/origami/request_bills.coffee
deleted file mode 100644
index 24f83d18..00000000
--- a/app/assets/javascripts/origami/request_bills.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/origami/paypar.scss b/app/assets/stylesheets/origami/paypar.scss
deleted file mode 100644
index 8cc055f3..00000000
--- a/app/assets/stylesheets/origami/paypar.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the origami/paypar controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/origami/request_bills.scss b/app/assets/stylesheets/origami/request_bills.scss
deleted file mode 100644
index 20719090..00000000
--- a/app/assets/stylesheets/origami/request_bills.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the origami/RequestBills controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 35a46907..fa521d6c 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -219,9 +219,9 @@
     <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">Req.Bill</button>
     <!-- Cashier Buttons -->
     <button type="button" id="discount" class="btn btn-primary btn-lg btn-block">Discount</button>
-    <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button>
+    <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
 
-    <button type="button" id="pay" class="btn btn-primary btn-lg btn-block" >Pay</button>
+    <button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" >Pay</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c2c15787..6da4bb17 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -165,42 +165,42 @@
 
 <script>
 $(document).on('click', '.cashier_number', function(event){
-        //event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#cash').text();
+  event.stopPropagation();
+  event.preventDefault();
+  if(event.handled !== true) {
+      var original_value;
+      original_value = $('#cash').text();
 
-            var input_type = $(this).attr("data-type");
-            
-            switch (input_type) {
-              case 'num':
-              var input_value = $(this).attr("data-value");
-              if (original_value == "0.0"){
-                $('#cash').text(input_value);
-                update_balance();
-              }else{
-                $('#cash').append(input_value);
-                update_balance();
-              }
-              break;
-
-              case 'add':
-                var input_value = $(this).attr("data-value");
-                amount = parseInt(input_value) + parseInt(original_value);
-                $('#cash').text(amount);
-                update_balance();
-              break;
-
-              case 'clr':
-                 $('#cash').text("0.0");
-                 update_balance();
-              break;
-          }
-          event.handled = true;
-        } else {
-            return false;
+      var input_type = $(this).attr("data-type");
+      
+      switch (input_type) {
+        case 'num':
+        var input_value = $(this).attr("data-value");
+        if (original_value == "0.0"){
+          $('#cash').text(input_value);
+          update_balance();
+        }else{
+          $('#cash').append(input_value);
+          update_balance();
         }
+        break;
+
+        case 'add':
+          var input_value = $(this).attr("data-value");
+          amount = parseInt(input_value) + parseInt(original_value);
+          $('#cash').text(amount);
+          update_balance();
+        break;
+
+        case 'clr':
+           $('#cash').text("0.0");
+           update_balance();
+        break;
+    }
+    event.handled = true;
+  } else {
+      return false;
+  }
 });
 
 $( document ).ready(function() {
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 6f563b42..248a36fb 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -11,8 +11,8 @@ Rails.application.config.assets.version = '1.0'
 # Rails.application.config.assets.precompile += %w( search.js )
 
 # --- Waiter/ Cashier - Orgiami ----
-Rails.application.config.assets.precompile += %w( orgiami.css )
-Rails.application.config.assets.precompile += %w( orgiami.js )
+Rails.application.config.assets.precompile += %w( origami.css )
+Rails.application.config.assets.precompile += %w( origami.js )
 # -- Order Queue Station -----
 Rails.application.config.assets.precompile += %w( OQS.css )
 Rails.application.config.assets.precompile += %w( OQS.js ) 

From e7a1687b8532d385e48bddfc7b17afe608d5b3e3 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 9 Jun 2017 11:59:08 +0630
Subject: [PATCH 10/15] update top menu bar for report

---
 app/views/layouts/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 4cea13e2..bdd146b7 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -31,7 +31,7 @@
             <li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
-        <li class="navbar-nav mr-auto">
+        <li class="navbar-nav mr-auto dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Reports</a>
           <ul class="dropdown-menu">
             <li><%= link_to "Daily Sale Report", origami_root_path, :tabindex =>"-1" %></li>

From 56ffd1f063b7c2d210808cbe1152586da0bd6053 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 9 Jun 2017 13:13:20 +0630
Subject: [PATCH 11/15] update sale order talble

---
 app/models/sale.rb                             |  8 ++++----
 app/models/sale_order.rb                       | 18 +++++++++++++++---
 app/models/sale_payment.rb                     |  2 +-
 app/models/seed_generator.rb                   | 12 ++++++++++--
 .../20170403140820_create_order_items.rb       |  1 +
 ...403153001_create_payment_method_settings.rb |  2 +-
 .../20170403174029_create_sale_orders.rb       |  4 ++--
 ...20170421171849_add_company_address_email.rb |  5 -----
 ...11602_additionparametertopaymentsettings.rb |  5 -----
 9 files changed, 34 insertions(+), 23 deletions(-)
 delete mode 100644 db/migrate/20170421171849_add_company_address_email.rb
 delete mode 100644 db/migrate/20170608111602_additionparametertopaymentsettings.rb

diff --git a/app/models/sale.rb b/app/models/sale.rb
index b0f07cb0..93ed327c 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -3,7 +3,6 @@ class Sale < ApplicationRecord
 
   #primary key - need to be unique generated for multiple shops
   before_create :generate_custom_id
-
   #before_create :generate_receipt_no
   belongs_to :cashier, :optional => true
   belongs_to :customer, :optional => true
@@ -33,7 +32,6 @@ class Sale < ApplicationRecord
         booking.sale_id = sale_id
       end
         order = booking.booking_orders.take.order
-        puts "add sale order"
         link_order_sale(order.id)
       return status, sale_id
     end
@@ -231,9 +229,10 @@ class Sale < ApplicationRecord
   def link_order_sale(order_id)
     #create if it doesn't exist
     saleOrder = SaleOrder.where("sale_id=? and order_id=?", self.id, order_id).take
-    
+
     if saleOrder.nil?
-      SaleOrder.create(:sale_id => self.id, :order_id => order_id)
+      sale_order = SaleOrder.new
+      sale_order.create_sale_order(self.id, order_id)
     end
     # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?)
     #   SaleOrder.create(:sale_id => self.id, :order_id => order_id)
@@ -261,6 +260,7 @@ class Sale < ApplicationRecord
   end
 
   private
+
   def generate_custom_id
     self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL")
   end
diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb
index 15da1386..5c8fea71 100644
--- a/app/models/sale_order.rb
+++ b/app/models/sale_order.rb
@@ -2,13 +2,25 @@ class SaleOrder < ApplicationRecord
   self.primary_key = "sale_order_id"
 
   #primary key - need to be unique generated for multiple shops
-  before_create :generate_custom_id
+  before_create :generate_sale_order_id
 
   belongs_to :sale
   belongs_to :order
 
+  def create_sale_order(sale, order)
+    self.sale_id = sale
+    self.order_id = order
+    self.save
+
+  end
+
   private
-  def generate_custom_id
-    self.sale_order_id = SeedGenerator.generate_id(self.class.name, "SOI")
+  def generate_sale_order_id
+    puts "create slae order id"
+    self.class.name
+    saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI")
+    puts saleOrderId
+    self.sale_order_id = saleOrderId
+    puts "create sale order id"
   end
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index d8aa1cee..6a9860c7 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -207,7 +207,7 @@ class SalePayment < ApplicationRecord
   def sale_update_payment_status(paid_amount)
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
-    self.sale.amount_changed = paid_amount - self.sale.amount_received
+    self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f
     if (self.sale.grand_total <=   self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb
index 5e7864b6..b333111f 100644
--- a/app/models/seed_generator.rb
+++ b/app/models/seed_generator.rb
@@ -1,14 +1,20 @@
 class SeedGenerator < ApplicationRecord
+
   def self.generate_id(model, prefix)
     seed = SeedGenerator.find_by_model(model)
+    puts "found seed"
+    puts seed
     new_receipt_no = 0
+
     if (seed.nil?)
+      puts "seed is null"
       seed = SeedGenerator.new()
       seed.model = model
       new_receipt_no = seed.next
       seed.save
 
     else
+      puts "seed is not null"
       current_no = seed.next
       seed.next = seed.next + seed.increase_by
       seed.current = current_no
@@ -16,8 +22,10 @@ class SeedGenerator < ApplicationRecord
     end
 
     padding_len = 15 - prefix.length
-
-    return prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
+    puts prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
+    puts "this is actural sale orde"
+    saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
+    return saleOrderId
 
   end
 
diff --git a/db/migrate/20170403140820_create_order_items.rb b/db/migrate/20170403140820_create_order_items.rb
index b0f43c32..c5382030 100644
--- a/db/migrate/20170403140820_create_order_items.rb
+++ b/db/migrate/20170403140820_create_order_items.rb
@@ -13,6 +13,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1]
       t.string :options
       t.json :set_menu_items #this parameter is require to route the items correctly
       t.boolean :taxable, :null => false, :default => true
+      t.string :completed_by
       t.timestamps
     end
   end
diff --git a/db/migrate/20170403153001_create_payment_method_settings.rb b/db/migrate/20170403153001_create_payment_method_settings.rb
index 981d42d3..339a3187 100644
--- a/db/migrate/20170403153001_create_payment_method_settings.rb
+++ b/db/migrate/20170403153001_create_payment_method_settings.rb
@@ -7,7 +7,7 @@ class CreatePaymentMethodSettings < ActiveRecord::Migration[5.1]
       t.string :gateway_url
       t.string :auth_token
       t.string :merchant_account_id
-
+      t.string :additional_parameters
       t.timestamps
     end
   end
diff --git a/db/migrate/20170403174029_create_sale_orders.rb b/db/migrate/20170403174029_create_sale_orders.rb
index e2b3fe40..a786163b 100644
--- a/db/migrate/20170403174029_create_sale_orders.rb
+++ b/db/migrate/20170403174029_create_sale_orders.rb
@@ -1,8 +1,8 @@
 class CreateSaleOrders < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_orders, :id => false do |t|
-      t.primary_key :sale_order_id #custom primary key - to ensure consistence for cloud syncing
-
+      
+      t.string :sale_order_id, :limit => 16, :primary_key => true
       t.string :sale_id, foreign_key: true,:limit => 16
       t.string :order_id, foreign_key: true, :limit => 16
 
diff --git a/db/migrate/20170421171849_add_company_address_email.rb b/db/migrate/20170421171849_add_company_address_email.rb
deleted file mode 100644
index 3bf6602e..00000000
--- a/db/migrate/20170421171849_add_company_address_email.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddCompanyAddressEmail < ActiveRecord::Migration[5.1]
-  def change
-  		add_column :order_items, :completed_by, :string
-  end
-end
diff --git a/db/migrate/20170608111602_additionparametertopaymentsettings.rb b/db/migrate/20170608111602_additionparametertopaymentsettings.rb
deleted file mode 100644
index ec85c209..00000000
--- a/db/migrate/20170608111602_additionparametertopaymentsettings.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Additionparametertopaymentsettings < ActiveRecord::Migration[5.1]
-  def change
-  		add_column :payment_method_settings, :additional_parameters, :string
-  end
-end

From 8b99f4844e40f83d9d6e3bd82d29f6f1eff45fb6 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 9 Jun 2017 13:33:12 +0630
Subject: [PATCH 12/15] bill api return updated

---
 app/controllers/api/bill_controller.rb         | 6 +++---
 app/controllers/origami/payments_controller.rb | 5 +++++
 app/models/sale_payment.rb                     | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index a98c8f3d..193a4a45 100644
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController
     #create Bill by Booking ID
     if (params[:booking_id])
       @sale = Sale.new
-      @status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
-    
+      @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
+
     elsif (params[:order_id])
       @sale = Sale.new
-      @status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
+      @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
 
     end
   end
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index c60efdac..fa8135fe 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -18,6 +18,11 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     if Sale.exists?(sale_id)
       @sale_data = Sale.find_by_sale_id(sale_id)
+      @sale_date.sale_payments.each do |spay|
+         if spay.payment_method == "cash"
+           @cash = spay.payment_amount
+         end
+      end
     end
   end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 1d98ba8f..573a2da3 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -211,6 +211,7 @@ class SalePayment < ApplicationRecord
     self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f
 
     if (self.sale.grand_total <=   self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
+      puts " sale update ......"
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
       self.sale.save!

From 82de95ca22654c4b1369dd323a9a5eca3507ffe9 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 9 Jun 2017 13:52:36 +0630
Subject: [PATCH 13/15] update

---
 app/controllers/crm/customers_controller.rb   | 32 ++++++++-----------
 .../origami/payments_controller.rb            |  2 +-
 app/models/sale.rb                            |  1 -
 app/models/sale_order.rb                      |  3 --
 app/models/sale_payment.rb                    | 12 ++++++-
 app/models/seed_generator.rb                  |  6 ----
 app/views/origami/payments/show.html.erb      |  2 +-
 7 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 325ac7dd..e1283bd6 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -38,10 +38,10 @@ class Crm::CustomersController < ApplicationController
   def create
 
     @crm_customers = Customer.new(customer_params)
-   
+
     respond_to do |format|
       if @crm_customers.save
-       
+
 
         name            = customer_params[:name]
         phone           = customer_params[:contact_no]
@@ -63,12 +63,10 @@ class Crm::CustomersController < ApplicationController
                                         )
 
           if response["status"] == true
-           puts "hhhhhhhhhhhhhhhhhh"
-           puts params[:sale_id]
               customer = Customer.find(@crm_customers.customer_id)
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"])
-              if params[:sale_id] != 0 
-                format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' }               
+              if params[:sale_id] != 0
+                format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' }
               else
                  format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: 'Customer was successfully created.' }
               end
@@ -77,27 +75,27 @@ class Crm::CustomersController < ApplicationController
 
               @crm_customers.destroy
 
-              if params[:sale_id] != 0 
+              if params[:sale_id] != 0
                 format.html { redirect_to crm_customers_path, notice: response["message"] }
-                
+
               else
                 format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] }
               end
-              
+
           end
 
-        
+
         # format.json { render :index, status: :created, location: @crm_customers }
 
       else
         if params[:sale_id] != 0
           format.html { redirect_to crm_customers_path}
           format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
-          
+
         else
           format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] }
         end
-        
+
       end
     end
   end
@@ -105,7 +103,7 @@ class Crm::CustomersController < ApplicationController
   # PATCH/PUT /crm/customers/1
   # PATCH/PUT /crm/customers/1.json
   def update
-    
+
     respond_to do |format|
       if @crm_customer.update(customer_params)
 
@@ -118,7 +116,7 @@ class Crm::CustomersController < ApplicationController
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
         app_token       = membership.auth_token.to_s
         url             = membership.gateway_url.to_s + "/api/update_membership_customer".to_s
-      
+
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         date_of_birth: date_of_birth,
                                                         id: id}.to_json,
@@ -127,7 +125,7 @@ class Crm::CustomersController < ApplicationController
                                                       'Accept'       => 'application/json'
                                               }
                                         )
-        
+
         format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' }
         format.json { render :show, status: :ok, location: @crm_customer }
 
@@ -153,7 +151,7 @@ class Crm::CustomersController < ApplicationController
  # DELETE /crm/customers/1
   # DELETE /crm/customers/1.json
   def get_sale_id
-    
+
     @sale_id        = params[:sale_id]
     @crm_customers  = Customer.all
     @crm_customer   = Customer.new
@@ -179,5 +177,3 @@ class Crm::CustomersController < ApplicationController
       params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth, :membership_type, :membership_authentication_code)
     end
 end
-
-
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fa8135fe..a3831439 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -18,7 +18,7 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     if Sale.exists?(sale_id)
       @sale_data = Sale.find_by_sale_id(sale_id)
-      @sale_date.sale_payments.each do |spay|
+        @sale_data.sale_payments.each do |spay|
          if spay.payment_method == "cash"
            @cash = spay.payment_amount
          end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 93ed327c..47d271f1 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -16,7 +16,6 @@ class Sale < ApplicationRecord
   scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
 
   def generate_invoice_from_booking(booking_id, requested_by)
-    puts "get invoice from booking"
     booking = Booking.find(booking_id)
     status = false
     Rails.logger.debug "Booking -> " + booking.id.to_s
diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb
index 5c8fea71..786054c9 100644
--- a/app/models/sale_order.rb
+++ b/app/models/sale_order.rb
@@ -16,11 +16,8 @@ class SaleOrder < ApplicationRecord
 
   private
   def generate_sale_order_id
-    puts "create slae order id"
     self.class.name
     saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI")
-    puts saleOrderId
     self.sale_order_id = saleOrderId
-    puts "create sale order id"
   end
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 573a2da3..bb829962 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -205,12 +205,22 @@ class SalePayment < ApplicationRecord
   end
 
   def sale_update_payment_status(paid_amount)
+    puts "sale update"
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
 
     self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f
 
-    if (self.sale.grand_total <=   self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
+    all_received_amount = 0.0
+    sObj = self.sale
+    sObj.sale_payments.each do |spay|
+        puts spay
+        puts spay.payment_amount
+        all_received_amount += spay.payment_amount.to_f
+    end
+    puts all_received_amount
+    puts self.sale.grand_total
+    if (self.sale.grand_total <= all_received_amount)
       puts " sale update ......"
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb
index b333111f..fe896a4d 100644
--- a/app/models/seed_generator.rb
+++ b/app/models/seed_generator.rb
@@ -2,19 +2,15 @@ class SeedGenerator < ApplicationRecord
 
   def self.generate_id(model, prefix)
     seed = SeedGenerator.find_by_model(model)
-    puts "found seed"
-    puts seed
     new_receipt_no = 0
 
     if (seed.nil?)
-      puts "seed is null"
       seed = SeedGenerator.new()
       seed.model = model
       new_receipt_no = seed.next
       seed.save
 
     else
-      puts "seed is not null"
       current_no = seed.next
       seed.next = seed.next + seed.increase_by
       seed.current = current_no
@@ -22,8 +18,6 @@ class SeedGenerator < ApplicationRecord
     end
 
     padding_len = 15 - prefix.length
-    puts prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
-    puts "this is actural sale orde"
     saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
     return saleOrderId
 
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 85505ef5..f16ef927 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -78,7 +78,7 @@
     <hr>
     <div class="row">
       <div class="col-md-8">CASH</div>
-      <div class="col-md-4" id="cash" >0.0</div>
+      <div class="col-md-4" id="cash" ><%= @cash %></div>
     </div>
     <hr>
     <div class="row" id="credit_payment">

From aa8068ad10e5a693a2e558efd739ada74ebec391 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Sun, 11 Jun 2017 13:02:03 +0630
Subject: [PATCH 14/15] Update

---
 .../origami/paypar_payments_controller.rb     |  4 ++--
 .../settings/membership_actions_controller.rb |  6 ++++--
 .../origami/others_payments/index.html.erb    | 21 +++++++++----------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index af5ce55f..b145ff63 100644
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -8,7 +8,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 			saleObj = Sale.find(sale_id)
       		sale_payment = SalePayment.new
       		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
-   
+
       		if status == true
       			@out = true, "Success!"
       		else
@@ -19,4 +19,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 		end
 
 	end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb
index 6db1a45b..0d1f8b78 100644
--- a/app/controllers/settings/membership_actions_controller.rb
+++ b/app/controllers/settings/membership_actions_controller.rb
@@ -14,13 +14,15 @@ class Settings::MembershipActionsController < ApplicationController
         if !membership_actions_data.nil?
             url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s
             puts url.to_json
-            sale_data = Sale.find_by_sale_id(@sale_id) 
+            sale_data = Sale.find_by_sale_id(@sale_id)
             if sale_data.customer_id
               customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+              puts customer_data.to_json
                @membership_id = customer_data.membership_id
                @campaign_type_id =1
                 if !@membership_id.nil?
                     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+                    puts membership_setting
                     membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
                     if membership_data["status"]==true
                         @membership_rebate_balance=membership_data["balance"]
@@ -41,7 +43,7 @@ class Settings::MembershipActionsController < ApplicationController
         end
       render :json => @out.to_json
     end
-    
+
   end
 
   # GET /settings/membership_actions/1
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 77c06904..f76d5146 100644
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -1,15 +1,15 @@
 <div class="row">
-	
+
 	<div class="col-lg-5 col-md-5 col-sm-3">
 			<div class="card">
 				<% @payment_method_setting.each do |payment_method|%>
 					<div class="col-md-5">
 		            	<div class="col-md-12 long purple " id="<%= payment_method.payment_method%>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
 		         	</div>
-				<% end %> 
+				<% end %>
 			</div>
 	</div>
-	
+
     <div class="col-lg-7 col-md-7 col-sm-7">
     	<div class="rebate-form" hidden="true">
     		<div class="row">
@@ -18,14 +18,14 @@
 				      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="">
 	    		</div>
 	    		<hr>
-	    	</div>	
+	    	</div>
 	    	<div class="row">
 	    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
 	      			<label class="col-lg-4 col-md-4 col-sm-4">Used Amount</label>
 	      			<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
 	    		</div>
 	    		<hr>
-	    	</div>	
+	    	</div>
     	</div>
     	<div class="row">
 	      <div class="col-md-12">
@@ -86,16 +86,16 @@
 	               </div>
 	             </div>
 	             <div class="col-md-5">
-	                <div class="col-md-12 cashier_number long purple" id="redeem" data-value="<%=@sale_id %>" data-member-value = "<%= @membership_id %>">PAY</div>
+	                <div class="col-md-12 cashier_number long purple" id="redeem" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">PAY</div>
 	             </div>
 	           </div>
 	      </div>
     </div>
-    	
+
     </div>
 </div>
 <div class="row">
-	
+
 </div>
 <script type="text/javascript">
 $(document).on('click', '.cashier_number', function(event){
@@ -121,7 +121,7 @@ $(document).on('click', '.cashier_number', function(event){
 	                	var input_value = $(this).attr("data-value");
 	                	amount = parseInt(input_value) + parseInt(original_value);
 	                	$('#used_amount').html(amount);
-                
+
              		break;
              		case 'clr':
              			$('#used_amount').html("0.0");
@@ -133,7 +133,6 @@ $(document).on('click', '.cashier_number', function(event){
         //     return false;
         // }
 });
-	  
 $("#REDIMREBATE").click(function(){
 		$('.rebate-form').removeAttr("hidden");
 		gateway_url = $(this).attr("data-url");
@@ -174,4 +173,4 @@ $("#redeem").click(function(){
 		})
 	}
 });
-</script>
\ No newline at end of file
+</script>

From 7ab9874b808d5906d8ae369c4571f69bbaa1abc2 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Sun, 11 Jun 2017 13:20:26 +0630
Subject: [PATCH 15/15] remove migration files

---
 app/views/origami/home/index.html.erb | 84 +++++++++++++--------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index fa521d6c..9e406ede 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -21,23 +21,23 @@
       <!--- Panel 0 - Table Orders -->
       <div class="tab-pane active" id="tables" role="tabpanel">
         <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-          <%   
-              @booking_orders.each do |bko| 
+          <%
+              @booking_orders.each do |bko|
                 # Assigned Id for new Order? Sale?
                 unique_id=""
                 # For CSS- Class for Order? Sale?
                 sale_status=""
-                if bko.order_status == 'new'   
+                if bko.order_status == 'new'
                   unique_id=bko.booking_id
-                else 
+                else
                   unique_id=bko.sale_id
                   sale_status="sold"
-                end                               
+                end
           %>
           <div class="card orders <%= sale_status  %>">
             <div class="card-block">
-              <p class="hidden orders-id"><%= unique_id  %></p>   
-              <h4 class="card-title orders-table"><%= bko.table_name %></h4>                                 
+              <p class="hidden orders-id"><%= unique_id  %></p>
+              <h4 class="card-title orders-table"><%= bko.table_name %></h4>
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -48,12 +48,12 @@
                 Order Status :
                 <span class="orders-order-status">
                   <%= bko.order_status %>
-                </span> 
+                </span>
                 </small>
-              </p>                                            
-            </div>              
-          </div> 
-          <%                                       
+              </p>
+            </div>
+          </div>
+          <%
             end
           %>
         </div>
@@ -62,23 +62,23 @@
       <!--- Panel 1 - Room Orders -->
       <div class="tab-pane active" id="rooms" role="tabpanel">
         <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-          <%   
-            @booking_rooms.each do |rmo| 
+          <%
+            @booking_rooms.each do |rmo|
               # Assigned Id for new Order? Sale?
               unique_id=""
               # For CSS- Class for Order? Sale?
               sale_status=""
-              if rmo.order_status == 'new'   
-                unique_id=rmo.booking_id              
-              else 
+              if rmo.order_status == 'new'
+                unique_id=rmo.booking_id
+              else
                 unique_id=rmo.sale_id
                 sale_status="sold"
-              end                               
+              end
           %>
           <div class="card orders <%= sale_status  %>">
             <div class="card-block">
-              <p class="hidden orders-id"><%= unique_id  %></p>   
-              <h4 class="card-title orders-table"><%= rmo.room_name %></h4>                                
+              <p class="hidden orders-id"><%= unique_id  %></p>
+              <h4 class="card-title orders-table"><%= rmo.room_name %></h4>
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -89,12 +89,12 @@
                 Order Status :
                 <span class="orders-order-status">
                   <%= rmo.order_status %>
-                </span> 
+                </span>
                 </small>
-              </p>                                            
-            </div>              
-          </div> 
-          <%                                       
+              </p>
+            </div>
+          </div>
+          <%
             end
           %>
         </div>
@@ -103,23 +103,23 @@
       <!--- Panel 2 - Orders -->
       <div class="tab-pane active" id="orders" role="tabpanel">
         <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-          <%   
-            @orders.each do |odr| 
+          <%
+            @orders.each do |odr|
               # Assigned Id for new Order? Sale?
               unique_id=""
               # For CSS- Class for Order? Sale?
               sale_status=""
-              if odr.order_status == 'new'  
+              if odr.order_status == 'new'
                 unique_id=odr.booking_id
-              else 
+              else
                 unique_id=odr.sale_id
                 sale_status="sold"
-              end                               
+              end
           %>
           <div class="card orders <%= sale_status  %>">
             <div class="card-block">
-              <p class="hidden orders-id"><%= unique_id  %></p>   
-              <h4 class="card-title orders-table"><%= odr.table_name %></h4>                                 
+              <p class="hidden orders-id"><%= unique_id  %></p>
+              <h4 class="card-title orders-table"><%= odr.table_name %></h4>
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -130,16 +130,16 @@
                 Order Status :
                 <span class="orders-order-status">
                   <%= odr.order_status %>
-                </span> 
+                </span>
                 </small>
-              </p>                                            
-            </div>              
-          </div> 
-          <%                                       
+              </p>
+            </div>
+          </div>
+          <%
             end
           %>
         </div>
-      
+
       </div>
     </div>
     <!-- tabs - End -->
@@ -157,10 +157,10 @@
             <div class="col-lg-6 col-md-6 col-sm-6">
               <p>Receipt No: <span id="receipt_no"></span></p>
               <p>Cashier:  <span id="cashier"></span></p>
-            </div> 
+            </div>
             <div class="col-lg-6 col-md-6 col-sm-6 text-right">
               <p>Date:  <span id="receipt_date"></span></p>
-            </div>                
+            </div>
           </div>
           <div class="card-text">
             <table class="table table-striped" id="order-items-table">
@@ -205,7 +205,7 @@
             </table>
           </div>
         </div>
-      </div>   
+      </div>
    </div>
 
   <!-- Column Three -->
@@ -215,7 +215,7 @@
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
 
-    <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
+    <button type="button" class="btn btn-primary btn-lg btn-block" disabled id="customer">Customer</button>
     <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">Req.Bill</button>
     <!-- Cashier Buttons -->
     <button type="button" id="discount" class="btn btn-primary btn-lg btn-block">Discount</button>