:q

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/origami.js

@@ -37,7 +37,7 @@ $(document).ready(function(){
 		control_button(order_status);
 
 		var customer_id=$(this).find(".customer-id").text();
-		//show_customer_details(customer_id);
+		show_customer_details(customer_id);
 
 		$("#re-print").val(unique_id);
 

app/assets/stylesheets/origami.scss

@@ -9,6 +9,8 @@
 //   min-height: 75rem;
 //   padding-top: 4.5rem;
 // }
+.card-columns {
+	font-size: 18px !important;}
 
 .others-payment{
 	line-height:100px;
@@ -128,6 +130,11 @@
 	text-align: right;
 }
 
+.item-attr-edit{
+	width: 10%;
+	text-align: left;
+}
+
 .display-none{
 	display: none;
 }
@@ -186,4 +193,4 @@ tr.discount-item-row:hover {
 
 .jconfirm-box-container{
 	margin-left:-40px !important
-}
+}