diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index 827ae6d4..d92ad452 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -111,7 +111,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1 m-t-10">
-  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 3ed44abc..4b32c515 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -123,8 +123,8 @@
              <%= t("views.btn.back") %>
           </button>
    <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
-      <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
-      </button>
+      <!-- <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
+      </button> -->
    <%end%>
    <%if current_login_employee.role != "waiter" %>
    <button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 945ac11c..837c9f43 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -114,7 +114,7 @@
 		</div>
 
 	<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 %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+		<button type="button" class="btn btn-default  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 	</div>
 </div>
 </div>
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 66d19bb5..f5c8f06b 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -115,7 +115,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn btn-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+ <button type="button" class="btn btn-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 2c00bf2e..f40ce252 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -116,7 +116,7 @@
 		</div>
 
 		<div class="col-md-1 col-lg-1 col-sm-1">
-			 <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+			 <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> 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 7c22ad03..a6a13a77 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -21,7 +21,7 @@
 			</div>
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1 m-t-10">
-  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 </div>
 	</div>
 </div>
@@ -51,6 +51,6 @@
 	})
 
 	$('#back').on('click',function(){
-		window.location.href = '/origami/sale/<%= @sale_id %>/payment/';
+		window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/';
 	})
 </script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index d73a7ed6..ff7ceacc 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -295,6 +295,9 @@
   </button>
   <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
   <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
+  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
+<button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
+<button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
   <!-- Waiter Buttons -->
 </div>
 <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
diff --git a/app/views/origami/paypar_payments/index.html.erb b/app/views/origami/paypar_payments/index.html.erb
index b83695ce..3b9fd2a3 100755
--- a/app/views/origami/paypar_payments/index.html.erb
+++ b/app/views/origami/paypar_payments/index.html.erb
@@ -10,7 +10,7 @@
 			</div>
 	</div>
 	<div class="col-lg-1 col-md-1 col-sm-1 m-t-10">
-  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
+  <button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> Back </button>
 </div>
 	
  <div>
\ No newline at end of file
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index 5698eb41..1d29e563 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -103,7 +103,7 @@
 
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1">
-		 <button type="button" class="btn bg-default m-t-10 btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
+		 <button type="button" class="btn bg-default m-t-10 btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"> <i class="material-icons m-t--5">reply</i>Back </button>
 		</div>
 	</div>
 </div>
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index e1425947..5dee20f1 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -115,7 +115,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+ <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 49c2e23d..2970ba44 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -115,7 +115,7 @@
 </div>
 
 <div class="col-lg-1 col-md-1 col-sm-1">
- <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
+ <button type="button" class="btn bg-default m-t-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment/others_payment';"><i class="material-icons m-t--5">reply</i> Back </button>
 </div>
 </div>
 </div>
diff --git a/app/views/origami/voucher/index.html.erb b/app/views/origami/voucher/index.html.erb
index 52dc64d7..0d349116 100755
--- a/app/views/origami/voucher/index.html.erb
+++ b/app/views/origami/voucher/index.html.erb
@@ -92,7 +92,7 @@
     </div>
 
 		<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 %>/payment/others_payment';"> Back </button>
+			<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>
 </div>