diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 8db28bd9..4b546105 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -22,9 +22,7 @@ $(function() {
         product = data;
 
         for(var field in product) {  
-          console.log(product[field].name);
           if (product[field].unit_price > 0) {
-            console.log("hi");
             qty             = 1;
             options         = [];
             item_attributes = [];
@@ -97,86 +95,95 @@ $(function() {
         var menu_items_list = $('.menu_items_list');
         menu_items_list.empty();
         menu_items = data.menu_items;
+        console.log(menu_items);
 
         for(var field in menu_items) {  
           if (menu_items[field].is_sub_item == false) {
             instances = menu_items[field].instances ;
-            qty = 1;
-            options = [];
-
-            if (JSON.stringify(menu_items[field].item_sets)!='[]') {
-              fa_plus = '';
-              add = '';
-              menu_item_box = 'set_item_box';
-              data_target = 'sx_item_set_detailModal';
-
-                 code            =  menu_items[field].code;
-                 name            =  menu_items[field].name;
-                 price           = 0;//parseFloat( menu_items[field].price).toFixed(2);
-                 is_available    = menu_items[field].is_available ;
-                 is_on_promotion = 0;
-                 item_attributes = menu_items[field].attributes;
-                 promotion_price =  menu_items[field].promotion_price;
-            }else{
-              fa_plus = 'material-icons';
-              add = 'add'
-              menu_item_box = 'menu_item_box';
-              data_target = 'sx_item_detailModal';
-
-              $(instances).each(function(i){
-                if (instances[i].is_default === true) {
-                 code            = instances[i].code;
-                 name            = instances[i].name;
-                 price           = parseFloat(instances[i].price).toFixed(2);
-                 is_available    = instances[i].is_available ;
-                 is_on_promotion = instances[i].is_on_promotion;
-                 item_attributes = instances[i].values;
-                 promotion_price = instances[i].promotion_price;
-                 code            = instances[i].code;
-               }
-              });
-
+            
+            if (!instances.length > 0) {
+              swal("Hello Please!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning");
             }
+            if (instances.length > 0) {
+              qty = 1;
+              options = [];
+              price = 0;
 
-            if (menu_items[field].image) {
-              image_path = menu_items[field].image;
-            }else{
-              image_path = "/image/logo.png";
-            }
+              if (JSON.stringify(menu_items[field].item_sets)!='[]') {
+                fa_plus = '';
+                add = '';
+                menu_item_box = 'set_item_box';
+                data_target = 'sx_item_set_detailModal';
 
-            row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
-                     +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
-                      +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
-                      +"<div class='col-md-3 add_icon' data-item-code='"
-                        + menu_items[field].code +"' data-name='"
-                        + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
-                        + price +"' data-instance-code = '"+ code +"' data-instance = '"
-                        + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
-                        + JSON.stringify(item_attributes) +"' data-options = '"
-                        + options +"' data-image='"+image_path+"'>"
-                      +"<i class='fa "+fa_plus+" '>"
-                      +add+ '</i>'
+                   code            =  menu_items[field].code;
+                   name            =  menu_items[field].name;
+                   price           = 0;//parseFloat( menu_items[field].price).toFixed(2);
+                   is_available    = menu_items[field].is_available ;
+                   is_on_promotion = 0;
+                   item_attributes = menu_items[field].attributes;
+                   promotion_price =  menu_items[field].promotion_price;
+              }else{
+                fa_plus = 'material-icons';
+                add = 'add'
+                menu_item_box = 'menu_item_box';
+                data_target = 'sx_item_detailModal';
+
+                $(instances).each(function(i){
+                  if (instances[i].is_default === true) {
+                   code            = instances[i].code;
+                   name            = instances[i].name;
+                   price           = parseFloat(instances[i].price).toFixed(2);
+                   is_available    = instances[i].is_available ;
+                   is_on_promotion = instances[i].is_on_promotion;
+                   item_attributes = instances[i].values;
+                   promotion_price = instances[i].promotion_price;
+                   code            = instances[i].code;
+                 }
+                });
+              }
+
+              if (menu_items[field].image) {
+                image_path = menu_items[field].image;
+              }else{
+                image_path = "/image/logo.png";
+              }
+
+              row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+                       +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+                        +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
+                        +"<div class='col-md-3 add_icon' data-item-code='"
+                          + menu_items[field].code +"' data-name='"
+                          + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
+                          + price +"' data-instance-code = '"+ code +"' data-instance = '"
+                          + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
+                          + JSON.stringify(item_attributes) +"' data-options = '"
+                          + options +"' data-image='"+image_path+"'>"
+                        +"<i class='fa "+fa_plus+" '>"
+                        +add+ '</i>'
+                        +'</div>'
+                       +'</div>'
+
+                    +"<div class='"+menu_item_box+"'  data-item-code='"
+                      + menu_items[field].code +"' data-instance = '"
+                      +JSON.stringify(menu_items[field].instances)+"' data-id = '"
+                      +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
+                      +JSON.stringify(item_attributes)+"' data-option = '"
+                      +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
+                      +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"'>"
+
+                      +"<div class='card-block custom-card-block'>"
+                        +"<img id='logo' height='125px' src='"+image_path+"'>"
+                      +"</div>"
+
+                      +'<div class="card-footer custom-card-footer">'
+                        +'<span>'+ price +'</span>'
                       +'</div>'
-                     +'</div>'
-
-                  +"<div class='"+menu_item_box+"'  data-item-code='"
-                    + menu_items[field].code +"' data-instance = '"
-                    +JSON.stringify(menu_items[field].instances)+"' data-id = '"
-                    +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
-                    +JSON.stringify(item_attributes)+"' data-option = '"
-                    +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
-                    +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"'>"
-
-                    +"<div class='card-block custom-card-block'>"
-                      +"<img id='logo' height='125px' src='"+image_path+"'>"
-                    +"</div>"
-
-                    +'<div class="card-footer custom-card-footer">'
-                      +'<span>'+ price +'</span>'
-                    +'</div>'
-                  +'</div>'; 
-            $('.menu_items_list').append(row);
+                    +'</div>'; 
+              $('.menu_items_list').append(row);
+            }
+            //end instances in menu-items alest 1 instance
           }
+          //end is_sub_item false
         }
       }
     });