From 5535a5db81f584d5a371fa7cbef2adf3d33566e8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 4 Oct 2018 16:47:44 +0630
Subject: [PATCH] UI changed

---
 app/controllers/origami/dinga_controller.rb   |  14 +-
 app/controllers/origami/paymal_controller.rb  |  14 +-
 .../origami/redeem_payments_controller.rb     |  14 +-
 app/controllers/origami/voucher_controller.rb |   2 +-
 app/views/origami/voucher/index.html.erb      | 139 ++++++++++--------
 5 files changed, 100 insertions(+), 83 deletions(-)

diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index 55705fce..01e35004 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -7,13 +7,13 @@ class Origami::DingaController < BaseOrigamiController
      @sale_data = Sale.find_by_sale_id(@sale_id)
      @receipt_no = @sale_data.receipt_no
      @shop        = Shop.first 
-          # if @shop.is_rounding_adj
-          #      new_total    = Sale.get_rounding_adjustment(@sale_data.grand_total)
-          # else
-          #     new_total    = @sale_data.grand_total
-          # end
-          # @rounding_adj = new_total-@sale_data.grand_total  
-          @rounding_adj = @sale_data.rounding_adjustment  
+          if @shop.is_rounding_adj
+               new_total    = Sale.get_rounding_adjustment(@sale_data.grand_total)
+          else
+              new_total    = @sale_data.grand_total
+          end
+          @rounding_adj = new_total-@sale_data.grand_total  
+          # @rounding_adj = @sale_data.rounding_adjustment  
 
           @payparcount = 0
           others = 0
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 911d5a24..19645e18 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -7,13 +7,13 @@ class Origami::PaymalController < BaseOrigamiController
      sale_data = Sale.find_by_sale_id(@sale_id)
      @receipt_no = sale_data.receipt_no
      @shop        = Shop.first 
-          # if @shop.is_rounding_adj
-          #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-          # else
-          #     new_total    = sale_data.grand_total
-          # end
-          # @rounding_adj = new_total-sale_data.grand_total  
-          @rounding_adj = sale_data.rounding_adjustment  
+          if @shop.is_rounding_adj
+               new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+          else
+              new_total    = sale_data.grand_total
+          end
+          @rounding_adj = new_total-sale_data.grand_total  
+          # @rounding_adj = sale_data.rounding_adjustment  
 
           @payparcount = 0
           others = 0
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 708f9f8f..c0edf879 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -7,13 +7,13 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
         @shop        = Shop.first 
-        # if @shop.is_rounding_adj
-        #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-        # else
-        #     new_total    = sale_data.grand_total
-        # end
-        # @rounding_adj = new_total-sale_data.grand_total  
-        @rounding_adj = sale_data.rounding_adjustment  
+        if @shop.is_rounding_adj
+             new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+        else
+            new_total    = sale_data.grand_total
+        end
+        @rounding_adj = new_total-sale_data.grand_total  
+        # @rounding_adj = sale_data.rounding_adjustment  
 
         @payparcount = 0
         others = 0
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 515bf3a1..e512a48b 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -1,7 +1,7 @@
 class Origami::VoucherController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit voucher_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb
index c8d99c28..cf7a30d9 100755
--- a/app/views/origami/voucher/index.html.erb
+++ b/app/views/origami/voucher/index.html.erb
@@ -1,13 +1,21 @@
+<div class="container-fluid">
+  <div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
+  <!-- <div class="page-header">
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item"><a href="<%=origami_root_path %>"><%= t :home %></a></li>
+      <li class="breadcrumb-item"><a href="/origami/sale/<%=@sale_id %>/payment"><%= t("views.btn.payment") %></a></li>
+      <li class="breadcrumb-item active"><%= t("views.btn.unionpay") %></li>
+      <span class="float-right">
+        <%= link_to t('.back',:default => t("views.btn.back")),'/origami/sale/'+@sale_id+'/payment/others_payment'%>
+      </span>
+    </ol>
+  </div> -->
+	<div class="row">
 
-<div class="row">
-
-	<div class="col-lg-5 col-md-5 col-sm-3">
-		<div class="row">
-			<div class="col-md-6">
-				<h2>Voucher / Coupon</h2>
-			</div>
-		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
+		<div class="col-lg-5 col-md-5 col-sm-5">
+			<div class="card m-l-10 m-t-10" style="padding:0px 20px;">
 				<div class="rebate-form">
 					<div class="row">
 						<div class="form-group col-lg-12 col-md-12 col-sm-12">
@@ -42,60 +50,60 @@
 			    	</div>
 		    	</div>
 			</div>
-	</div>
+		</div>
 
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
-
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <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 orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="voucher_pay">Pay</div>
-           </div>
-         </div>
-      </div>
-
-    </div>
-    <input type="hidden" id="sale_id" value="<%= @sale_id %>">
-	<div class="col-lg-1 col-md-1 col-sm-1">
-		<button type="button" class="btn btn-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> Back </button>
+	    <div class="col-lg-6 col-md-6 col-sm-6" style="">
+			<div class=" m-t-10 p-l-20">
+				<div class="row">
+				 <div class="col-lg-6 col-md-6 col-sm-6">
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number " data-value="1" data-type="num">1</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number  border-left" data-value="4" data-type="num">4</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number  border-left" data-value="7" data-type="num">7</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number  border-left" data-value="0" data-type="num">0</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="." data-type="num">.</div>
+				     <div class="col-md-4 cashier_number border-left" data-value="00" data-type="num">00</div>
+				   </div>
+				   <div class="row bottom">
+				     <div class="col-md-4 cashier_number green border-left" data-type="nett" >Nett</div>
+				     <div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
+				     <div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
+				   </div>
+				 </div>
+				 <div class="col-lg-6 col-md-6 col-sm-6">
+				   <div class="row bottom m-l-5">
+				     <div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
+				     <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+				   </div>
+				   <div class="row bottom m-l-5">
+				     <div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
+				     <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+				   </div>
+				   <div class="row bottom m-l-5">
+				     <div class="pay purple left" id="unionpay_pay">Pay</div>
+				   </div>
+				 </div>
+				</div>
+			</div>
+		</div>
+	    <input type="hidden" id="sale_id" value="<%= @sale_id %>">
+		<div class="col-lg-1 col-md-1 col-sm-1">
+			<button type="button" class="btn bg-default m-t-10 btn-block" id="back"><i class="material-icons m-t--5">reply</i> Back </button>
+		</div>
 	</div>
 </div>
-
 <script>
 $(document).ready(function() {
       	setHeaderBreadCrumb(_VOUCHER_);
@@ -177,5 +185,14 @@ $(document).on('click', '.cashier_number', function(event){
 		}else{
 			alert("Paid Amount is over!");
 		}
-  })
+  });
+
+  $('#back').on('click',function(){
+    var url_param = "payment";
+    if(location.pathname.includes("credit_payment")){
+      url_param = "credit_payment";
+    }
+    window.location.href = '/origami/sale/'+'<%= @sale_id %>'+'/<%= @cashier_type %>/'+url_param;
+      // window.location.href = '/origami/sale/' + sale_id + "/cashier/payment";
+  });
 </script>