incomplete shop update

index.html

@@ -1771,7 +1771,7 @@
     <div style="width: 25px;height: 2px;background-color: white;margin: 4px 0;display:block;margin-left:auto;margin-right:auto;border-radius:5px;"></div>
 </div>
 -->
-                    <p class="left activePage" style="margin: 0px; margin-left: 55px; font-weight: bold;"><svg onclick='$("#buyStoreTokens").modal("open")' id="storeWallet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 334.877 334.877" style="enable-background:new 0 0 334.877 334.877;margin: 3px;width: 26px;float: left;margin-top: 13px;margin-left: 15px;" xml:space="preserve"><path d="M333.196,155.999h-16.067V82.09c0-17.719-14.415-32.134-32.134-32.134h-21.761L240.965,9.917 C237.571,3.798,231.112,0,224.107,0c-3.265,0-6.504,0.842-9.364,2.429l-85.464,47.526H33.815 c-17.719,0-32.134,14.415-32.134,32.134v220.653c0,17.719,14.415,32.134,32.134,32.134h251.18 c17.719,0,32.134-14.415,32.134-32.134v-64.802h16.067V155.999z M284.995,62.809c9.897,0,17.982,7.519,19.068,17.14h-24.152 l-9.525-17.14H284.995z M220.996,13.663c3.014-1.69,7.07-0.508,8.734,2.494l35.476,63.786H101.798L220.996,13.663z M304.275,302.742c0,10.63-8.651,19.281-19.281,19.281H33.815c-10.63,0-19.281-8.651-19.281-19.281V82.09 c0-10.63,8.651-19.281,19.281-19.281h72.353L75.345,79.95H37.832c-3.554,0-6.427,2.879-6.427,6.427s2.873,6.427,6.427,6.427h14.396 h234.83h17.217v63.201h-46.999c-21.826,0-39.589,17.764-39.589,39.589v2.764c0,21.826,17.764,39.589,39.589,39.589h46.999V302.742z M320.342,225.087h-3.213h-59.853c-14.743,0-26.736-11.992-26.736-26.736v-2.764c0-14.743,11.992-26.736,26.736-26.736h59.853 h3.213V225.087z M276.961,197.497c0,7.841-6.35,14.19-14.19,14.19c-7.841,0-14.19-6.35-14.19-14.19s6.35-14.19,14.19-14.19 C270.612,183.306,276.961,189.662,276.961,197.497z" style="fill: white;"></path></svg><span class="loadStoreBal" style=" padding: 10px 10px;"></span>
+                    <p class="left activePage walletBalDiv" style="margin: 0px; margin-left: 55px; font-weight: bold;"><svg onclick='$("#buyStoreTokens").modal("open")' id="storeWallet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 334.877 334.877" style="enable-background:new 0 0 334.877 334.877;margin: 3px;width: 26px;float: left;margin-top: 13px;margin-left: 15px;" xml:space="preserve"><path d="M333.196,155.999h-16.067V82.09c0-17.719-14.415-32.134-32.134-32.134h-21.761L240.965,9.917 C237.571,3.798,231.112,0,224.107,0c-3.265,0-6.504,0.842-9.364,2.429l-85.464,47.526H33.815 c-17.719,0-32.134,14.415-32.134,32.134v220.653c0,17.719,14.415,32.134,32.134,32.134h251.18 c17.719,0,32.134-14.415,32.134-32.134v-64.802h16.067V155.999z M284.995,62.809c9.897,0,17.982,7.519,19.068,17.14h-24.152 l-9.525-17.14H284.995z M220.996,13.663c3.014-1.69,7.07-0.508,8.734,2.494l35.476,63.786H101.798L220.996,13.663z M304.275,302.742c0,10.63-8.651,19.281-19.281,19.281H33.815c-10.63,0-19.281-8.651-19.281-19.281V82.09 c0-10.63,8.651-19.281,19.281-19.281h72.353L75.345,79.95H37.832c-3.554,0-6.427,2.879-6.427,6.427s2.873,6.427,6.427,6.427h14.396 h234.83h17.217v63.201h-46.999c-21.826,0-39.589,17.764-39.589,39.589v2.764c0,21.826,17.764,39.589,39.589,39.589h46.999V302.742z M320.342,225.087h-3.213h-59.853c-14.743,0-26.736-11.992-26.736-26.736v-2.764c0-14.743,11.992-26.736,26.736-26.736h59.853 h3.213V225.087z M276.961,197.497c0,7.841-6.35,14.19-14.19,14.19c-7.841,0-14.19-6.35-14.19-14.19s6.35-14.19,14.19-14.19 C270.612,183.306,276.961,189.662,276.961,197.497z" style="fill: white;"></path></svg><span class="loadStoreBal" style=" padding: 10px 10px;"></span>
                         <!--                        <span style=" padding: 10px 10px;">00</span>-->
                     </p>
                     <a id="entSettings" style="float: right; padding: 6px; height: 50px; padding-right: 10px;">
@@ -1784,7 +1784,7 @@
                             <path fill="white" d="M6.634,13.591H2.146c-0.247,0-0.449,0.201-0.449,0.448v2.692c0,0.247,0.202,0.449,0.449,0.449h4.488c0.247,0,0.449-0.202,0.449-0.449v-2.692C7.083,13.792,6.881,13.591,6.634,13.591 M6.185,16.283h-3.59v-1.795h3.59V16.283zM6.634,8.205H2.146c-0.247,0-0.449,0.202-0.449,0.449v2.692c0,0.247,0.202,0.449,0.449,0.449h4.488c0.247,0,0.449-0.202,0.449-0.449V8.653C7.083,8.407,6.881,8.205,6.634,8.205 M6.185,10.897h-3.59V9.103h3.59V10.897z M6.634,2.819H2.146c-0.247,0-0.449,0.202-0.449,0.449V5.96c0,0.247,0.202,0.449,0.449,0.449h4.488c0.247,0,0.449-0.202,0.449-0.449V3.268C7.083,3.021,6.881,2.819,6.634,2.819 M6.185,5.512h-3.59V3.717h3.59V5.512z M15.933,5.683c-0.175-0.168-0.361-0.33-0.555-0.479l1.677-1.613c0.297-0.281,0.088-0.772-0.31-0.772H9.336c-0.249,0-0.448,0.202-0.448,0.449v7.107c0,0.395,0.471,0.598,0.758,0.326l1.797-1.728c0.054,0.045,0.107,0.094,0.161,0.146c0.802,0.767,1.243,1.786,1.243,2.867c0,1.071-0.435,2.078-1.227,2.837c-0.7,0.671-1.354,1.086-2.345,1.169c-0.482,0.041-0.577,0.733-0.092,0.875c0.687,0.209,1.12,0.314,1.839,0.314c0.932,0,1.838-0.173,2.673-0.505c0.835-0.33,1.603-0.819,2.262-1.449c1.322-1.266,2.346-2.953,2.346-4.751C18.303,8.665,17.272,6.964,15.933,5.683 M15.336,14.578c-1.124,1.077-2.619,1.681-4.217,1.705c0.408-0.221,0.788-0.491,1.122-0.812c0.97-0.929,1.504-2.168,1.504-3.485c0-1.328-0.539-2.578-1.521-3.516c-0.178-0.17-0.357-0.321-0.548-0.456c-0.125-0.089-0.379-0.146-0.569,0.041L9.769,9.327v-5.61h5.861l-1.264,1.216c-0.099,0.094-0.148,0.229-0.137,0.366c0.014,0.134,0.088,0.258,0.202,0.332c0.313,0.204,0.61,0.44,0.882,0.7c1.158,1.111,2.092,2.581,2.092,4.145C17.405,12.026,16.48,13.482,15.336,14.578"></path>
                         </svg>
                     </a>
-                    <a onclick="shareStore()" style="padding-right: 10px; float: right; padding-top: 4px;">
+                    <a class="shareStoreBtn" onclick="shareStore()" style="padding-right: 10px; float: right; padding-top: 4px;">
                         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 473.932 473.932" style="enable-background:new 0 0 473.932 473.932;width: 21px;" xml:space="preserve">
                         <g>
                             <g>
@@ -1793,7 +1793,7 @@
                         </g>
                         </svg>
                     </a>
-                    <a style="float: right; padding: 14px 15px; line-height: 1; display: none;" id="incompleteShopIcon" onclick="$('#completeShopSetup').modal('open')">
+                    <a style="padding: 14px 15px; line-height: 1; display: block; position: absolute; left: 55px; top: 0px; z-index: 10;" id="incompleteShopIcon" onclick="$('#completeShopSetup').modal('open')">
                         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 486.463 486.463" style="enable-background:new 0 0 486.463 486.463;width: 25px;/* float: right; */" xml:space="preserve" onclick="$('#completeShopSetup').modal('open')">
                     		<path d="M243.225,333.382c-13.6,0-25,11.4-25,25s11.4,25,25,25c13.1,0,25-11.4,24.4-24.4    C268.225,344.682,256.925,333.382,243.225,333.382z" fill="#D80027"></path>
                     		<path d="M474.625,421.982c15.7-27.1,15.8-59.4,0.2-86.4l-156.6-271.2c-15.5-27.3-43.5-43.5-74.9-43.5s-59.4,16.3-74.9,43.4    l-156.8,271.5c-15.6,27.3-15.5,59.8,0.3,86.9c15.6,26.8,43.5,42.9,74.7,42.9h312.8    C430.725,465.582,458.825,449.282,474.625,421.982z M440.625,402.382c-8.7,15-24.1,23.9-41.3,23.9h-312.8    c-17,0-32.3-8.7-40.8-23.4c-8.6-14.9-8.7-32.7-0.1-47.7l156.8-271.4c8.5-14.9,23.7-23.7,40.9-23.7c17.1,0,32.4,8.9,40.9,23.8    l156.7,271.4C449.325,369.882,449.225,387.482,440.625,402.382z" fill="#D80027"></path>

js/deliveries.js

@@ -13,6 +13,8 @@ function deliveryMbr() {
         $("#ordMembersLst").html("");
         if (deliveryMemberLst.length == 0) {
             $('#incompleteShopIcon').css('display', 'block');
+            $('.shareStoreBtn').css('display', 'none');
+            $('.walletBalDiv').css('display', 'none');
             if ($('.addOperatorShopError').length >= 1) {
                 //Do nothing
             } else {
@@ -75,7 +77,9 @@ function deliveryMbr() {
     $("#rangeOutputId").val(rateInput);
 
     if (rateInput == 0 || rateInput == undefined || rateInput == '') {
-        $('#incompleteShopIcon').css('display', 'block')
+        $('#incompleteShopIcon').css('display', 'block');
+        $('.shareStoreBtn').css('display', 'none');
+        $('.walletBalDiv').css('display', 'none');
         $('#shopIncompleteLst').append("<li>Set shop's delivery rate</li>")
     }
 }

js/store.js

@@ -251,13 +251,19 @@ function editStoreContent() {
     document.querySelector('#colorChosen').value = xx.theme;
     M.updateTextFields();
 
+    $('#shopIncompleteLst').html('')
+
     if (xx.lonlat == '' || xx.lonlat == undefined || xx.lonlat == null) {
-        $('#incompleteShopIcon').css('display', 'block')
+        $('#incompleteShopIcon').css('display', 'block');
+        $('.shareStoreBtn').css('display', 'none');
+        $('.walletBalDiv').css('display', 'none');
         $('#shopIncompleteLst').append("<li>Add store location</li>")
     }
     if (xx.phone == '' || xx.phone == undefined || xx.phone == null) {
-        $('#incompleteShopIcon').css('display', 'block')
-        $('#shopIncompleteLst').append("<li>Add store phone number</li>")
+        $('#incompleteShopIcon').css('display', 'block');
+        $('.shareStoreBtn').css('display', 'none');
+        $('.walletBalDiv').css('display', 'none');
+        $('#shopIncompleteLst').append("<li>Add store phone number</li>");
     }
 }