From 6272e0795920fa65518d1707ccd92583ea4f5ea3 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Wed, 21 Jun 2017 06:19:06 +0630
Subject: [PATCH] add back action

---
 app/assets/stylesheets/origami.scss              |  4 ++++
 app/views/origami/jcb/index.html.erb             |  6 +++---
 app/views/origami/master/index.html.erb          |  9 ++++++---
 app/views/origami/mpu/index.html.erb             |  6 +++---
 app/views/origami/others_payments/index.html.erb | 10 +++++++++-
 app/views/origami/payments/show.html.erb         |  6 +++---
 app/views/origami/redeem_payments/index.html.erb |  6 +++---
 app/views/origami/visa/index.html.erb            |  6 +++---
 8 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index f4ef30ac..2f5b5df2 100644
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -110,6 +110,10 @@
 	background-color: #009900
 }
 
+.orange{
+	background-color: #FF8C00
+}
+
 .left{
 	margin-left:1px;
 }
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index bb9f0740..ac4b2438 100644
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -68,9 +68,9 @@
              <div class=" cashier_number left" data-value="00" data-type="num">00</div>
            </div>
            <div class="row bottom">
-             <div class=" cashier_number " data-type="nett" >Nett</div>
+             <div class=" cashier_number green" data-type="nett" >Nett</div>
              <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number green left" data-type="clr">Clr</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
            </div>
          </div>
          <div class="col-lg-6 col-md-1 col-sm-1">
@@ -91,7 +91,7 @@
     </div>
 
 		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"><i class="fa fa-arrow-left fa-lg"></i> Back </button>
+			<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 		</div>
 </div>
 
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 8099473d..09fe02b1 100644
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -68,9 +68,9 @@
              <div class=" cashier_number left" data-value="00" data-type="num">00</div>
            </div>
            <div class="row bottom">
-             <div class=" cashier_number del_cashier_number" data-type="nett" disable>Nett</div>
+             <div class=" cashier_number green" data-type="nett" >Nett</div>
              <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number green left" data-type="clr">Clr</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
            </div>
          </div>
          <div class="col-lg-6 col-md-1 col-sm-1">
@@ -91,7 +91,7 @@
     </div>
 
 		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
+			<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 		</div>
 </div>
 
@@ -133,6 +133,9 @@ $(document).on('click', '.cashier_number', function(event){
              		case 'del' :
 			          var cash=$('#amount').text();
 			          $('#amount').text(cash.substr(0,cash.length-1));
+								case 'nett':
+								var remain_amount = $('#validamount').val();
+								$('#amount').text(remain_amount);
 			        break;
 
           		}
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index ed176375..eb2267e7 100644
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -68,9 +68,9 @@
              <div class=" cashier_number left" data-value="00" data-type="num">00</div>
            </div>
            <div class="row bottom">
-             <div class=" cashier_number " data-type="nett" >Nett</div>
+             <div class=" cashier_number green" data-type="nett" >Nett</div>
              <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number green left" data-type="clr">Clr</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
            </div>
          </div>
          <div class="col-lg-6 col-md-1 col-sm-1">
@@ -91,7 +91,7 @@
     </div>
 
 		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
+			<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 		</div>
 </div>
 
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 4b2397a2..9ca152ac 100644
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-
+<div class="col-lg-11col-md-11 col-sm-11">
 	<div >
 			<div >
 				<% @payment_method_setting.each do |payment_method|%>
@@ -8,6 +8,10 @@
 			</div>
 	</div>
 </div>
+<div class="col-lg-1 col-md-1 col-sm-1">
+	<button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
+</div>
+</div>
 
 <script type="text/javascript">
 
@@ -16,4 +20,8 @@ $('.others-payment').on('click',function(){
 	var sale_id = $(this).attr("data-sale-id");
 	window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/" + input_type;
 })
+
+$('#back').on('click',function(){
+	window.location.href = '/origami/sale/<%= @sale_id %>/payment/';
+})
 </script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 91d5b6b2..6b83702a 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -212,9 +212,9 @@
              <div class=" cashier_number left" data-value="00" data-type="num">00</div>
            </div>
            <div class="row bottom">
-             <div class=" cashier_number" data-type="nett">Nett</div>
+             <div class=" cashier_number green" data-type="nett">Nett</div>
              <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number green left" data-type="clr">Clr</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
            </div>
          </div>
          <div class="col-lg-6 col-md-1 col-sm-1">
@@ -235,7 +235,7 @@
   </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- Waiter Buttons -->
-    <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';">  <i class="fa fa-arrow-left fa-lg"></i> Back </button>
+    <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
     <button type="button" class="btn btn-primary btn-block"> FOC </button>
     <button type="button" class="btn btn-primary btn-block"> Void </button>
 
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 83b24213..7789480f 100644
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -66,9 +66,9 @@
              <div class=" cashier_number left" data-value="00" data-type="num">00</div>
            </div>
            <div class="row bottom">
-             <div class=" cashier_number " data-type="nett">Nett</div>
+             <div class=" cashier_number green" data-type="nett">Nett</div>
              <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number green left" data-type="clr">Clr</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
            </div>
          </div>
          <div class="col-lg-6 col-md-1 col-sm-1">
@@ -91,7 +91,7 @@
 
     </div>
 		<div class="col-lg-1 col-md-1 col-sm-1">
-		 <button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
+		 <button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 	 </div>
 </div>
 <div class="row">
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 5eaf2e28..49f1290a 100644
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -68,9 +68,9 @@
              <div class=" cashier_number left" data-value="00" data-type="num">00</div>
            </div>
            <div class="row bottom">
-             <div class=" cashier_number" data-type="nett" >Nett</div>
+             <div class=" cashier_number green" data-type="nett" >Nett</div>
              <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number green left" data-type="clr">Clr</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
            </div>
          </div>
          <div class="col-lg-6 col-md-1 col-sm-1">
@@ -91,7 +91,7 @@
     </div>
 
 		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"><i class="fa fa-arrow-left fa-lg"></i> Back </button>
+			<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 		</div>
 </div>