Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes

app/assets/javascripts/addorder.js

@@ -409,11 +409,7 @@ $(function() {
                         +'</div>'
               $(".selected-set-list").append(set);
           }else{
-<<<<<<< HEAD
-             swal("Alert !", 'Maximum Qty is  ' + max_qty + "  items", "warning");
-=======
              swal("Alert !", 'Maximum Select is  ' + max_qty + "  items", "warning");
->>>>>>> 8217b7c2f27f5b38b27425929d01b789da0583fd
           }
         // }
         $('#set_unit_price').text(price);

app/assets/stylesheets/login.scss

@@ -105,7 +105,7 @@
 /* Shop Name in Login Page */
 .current-shop-name{
   color : #FFFFFF;
-  font-size: 25px;
+  font-size: 21px;
   font-weight: bold;
-  margin : 0 0 25px 0;
+  margin : 0 0 20px 0;
 }

app/views/layouts/login.html.erb

@@ -79,6 +79,13 @@
           <small>Version - 1.0.1</small>
         </p> 
       </div>
+      <div class="row">
+          <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
+            <div class="current-shop-name">
+                <span><%= shop_detail.name %></span> 
+              </div>
+          </div>
+        </div>
       <%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
       <div class="card padding-10">
         <div class="card-header m-l-">

app/views/layouts/login_dashboard.html.erb

@@ -67,8 +67,8 @@
         </div>
         <div class="row">
             <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
-            <div class="current-shop-name">
-                <span><%= shop_detail.name %></span> 
+                <div class="current-shop-name">
+                    <span><%= shop_detail.name %></span> 
                 </div>
             </div>
         </div>

config/secrets.yml

@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L