Pull from master

app/assets/javascripts/addorder.js

@@ -1012,12 +1012,14 @@ $(function() {
   //calculate subtotal
   function calculate_sub_total(){ 
     var total_price    = 0;
+    var total_qty      = 0;
     var taxable_amount = 0;
     var item_row       = $('.summary-items tbody tr');
 
     $(item_row).each(function(i){
       var unit_price = parseFloat($(item_row[i]).attr('data-price'));
       var qty        = parseFloat($(item_row[i]).children('#item_qty').text());
+      total_qty += qty; 
       total_price += qty*unit_price;    
     }); 
     var fixed_total_price    = parseFloat(total_price).toFixed(2);
@@ -1026,6 +1028,9 @@ $(function() {
     $('#sub_total').empty(); 
     $('#sub_total').append(fixed_total_price);
 
+    $('#total_qty').empty(); 
+    $('#total_qty').append(total_qty);
+
     if (item_row.length > 0) {
       $('.create').removeAttr("disabled", false);
     }else{
@@ -1432,7 +1437,8 @@ $(function() {
                   }
                 }
 
-                row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+                row = '<div class="col-md-3">'
+                +'<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                          +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
                           +'<div class="col-md-10 " style="padding:0px !important;">'+ menu_items[field].name +'</div>'
                           +"<div class='col-md-2 "+menu_item_box+" ' data-item-code='"
@@ -1466,7 +1472,8 @@ $(function() {
                         +'<div class="card-footer custom-card-footer" style="opacity:0.7">'
                           +'<span>'+ price +'</span>'
                         +'</div>'
-                      +'</div>'; 
+                      +'</div>'
+                      +'</div>'; ; 
                 $('.menu_items_list').append(row);
               }
               //end instances in menu-items alest 1 instance

app/assets/javascripts/settings/processing_items.js

@@ -1,7 +1,6 @@
 $(document).ready(function() {
   $(".processitems").click(function(event){
     event.preventDefault();
-    console.log($(this).data("id"));
     var item = $(this).data("id");
     $(this).toggleClass("opi_selected");
 
@@ -13,7 +12,6 @@ $(document).ready(function() {
     console.log($(this).data("id"));
     var group_id = $(this).data("id");
     var selector = "#" + group_id + " li div";
-    console.log ($(selector));
 
     $(selector).removeClass("opi_selected");
     $(selector).addClass("opi_selected");
@@ -25,7 +23,6 @@ $(document).ready(function() {
     console.log($(this).data("id"));
     var group_id = $(this).data("id");
     var selector = "#" + group_id + " li div";
-    console.log ($(selector));
 
     $(selector).removeClass("opi_selected");
   });
@@ -36,7 +33,6 @@ $(document).ready(function() {
     var items = new Array();
     selected_div = $(".opi_selected");
     $.each( selected_div, function( key, value ) {
-      console.log($(value).attr("data-id"));
       items.push($(value).attr("data-id"));
     });
 

app/assets/stylesheets/addorder.scss

@@ -12,6 +12,7 @@ section .content{
 }
 .custom-card {
     border: 2px solid rgba(0, 0, 0, 0.125) !important;
+        margin-bottom: 7px !important;
 }
 .custom-card-footer{
    padding:0.35rem 1.25rem !important;
@@ -72,16 +73,26 @@ section .content{
 .nav-tabs {
    background-color: #ccc;
 }
+.nav-tabs li a.active{
+  border-bottom:1px solid #54A5AF !important;
+}
 .nav-tabs .nav-link {
   padding: 0.7286rem 0.2575;
   border-top-left-radius: 0rem;
     border-top-right-radius: 0rem;
 }
+
+.nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover {
+    color: #54A5AF #54A5AF #54A5AF;
+}
+.nav-tabs .nav-link.active:focus, .nav-tabs .nav-link.active:hover {
+    background-color: #009688;
+}
 .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link {
-    background-color: #a1aade;
-    border-left: 6px solid #111;
-    color:#54A5AF;
-    font-weight: bold;
+    background-color: #fff !important;
+    border-left: 6px solid #54A5AF !important;
+    color: #54A5AF !important;
+    font-weight: bold !important;
     border-color: #fff #fff #fff #54A5AF;
 }
 .sub_category_list{

app/assets/stylesheets/origami.scss

@@ -462,4 +462,9 @@ iframe {
 /* section class for webview */
 .section-margin {
 	margin-top: -50px;
+}
+
+.tax-btn-box {
+	width: 230px; 
+	height: 80px;
 }