merge with origin

2017-10-27 17:06:07 +06:30
parent 0f24cc0999
commit 5c27dcff66
15 changed files with 135 additions and 250 deletions
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/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-primary m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+		<button type="button" class="btn btn-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
 	</div>
 </div>