Merge pull request #57 from bitsoko-services/master

Updates

js/bitsoko.js

@@ -732,7 +732,10 @@ function userNamesInput() {
         for (var iii in e.users) {
             var nm = e.users[iii].name;
             var icn = e.users[iii].icon;
-            deliveryGuysNames.push(nm)
+            deliveryGuysNames.push({
+                name: nm,
+                pic: icn
+            })
             //var id = e.users[iii].id;
             dat[nm] = icn;
 
@@ -744,69 +747,74 @@ function userNamesInput() {
 }
 
 function autocomplete(inp, arr) {
-  var currentFocus;
-  inp.addEventListener("input", function(e) {
-      var a, b, i, val = this.value;
-      closeAllLists();
-      if (!val) { return false;}
-      currentFocus = -1;
-      a = document.createElement("DIV");
-      a.setAttribute("id", this.id + "autocomplete-list");
-      a.setAttribute("class", "autocomplete-items");
-      this.parentNode.appendChild(a);
-      for (i = 0; i < arr.length; i++) {
-        if (arr[i].substr(0, val.length).toUpperCase() == val.toUpperCase()) {
-          b = document.createElement("DIV");
-          b.innerHTML = "<strong>" + arr[i].substr(0, val.length) + "</strong>";
-          b.innerHTML += arr[i].substr(val.length);
-          b.innerHTML += "<input type='hidden' value='" + arr[i] + "'>";
-          b.addEventListener("click", function(e) {
-              inp.value = this.getElementsByTagName("input")[0].value;
-              closeAllLists();
-          });
-          a.appendChild(b);
+    var currentFocus;
+    inp.addEventListener("input", function(e) {
+        var a, b, i, val = this.value;
+        closeAllLists();
+        if (!val) {
+            return false;
         }
-      }
-  });
-  inp.addEventListener("keydown", function(e) {
-      var x = document.getElementById(this.id + "autocomplete-list");
-      if (x) x = x.getElementsByTagName("div");
-      if (e.keyCode == 40) {
-        currentFocus++;
-        addActive(x);
-      } else if (e.keyCode == 38) {
-        currentFocus--;
-        addActive(x);
-      } else if (e.keyCode == 13) {
-        e.preventDefault();
-        if (currentFocus > -1) {
-          if (x) x[currentFocus].click();
+        currentFocus = -1;
+        a = document.createElement("DIV");
+        a.setAttribute("id", this.id + "autocomplete-list");
+        a.setAttribute("class", "autocomplete-items");
+        this.parentNode.appendChild(a);
+        for (i = 0; i < arr.length; i++) {
+            if (arr[i].name.substr(0, val.length).toUpperCase() == val.toUpperCase()) {
+                b = document.createElement("DIV");
+                b.innerHTML = "<strong>" + arr[i].name.substr(0, val.length) + "</strong>";
+                b.innerHTML += arr[i].name.substr(val.length);
+                b.innerHTML += "<input type='hidden' value='" + arr[i].name + "'><img src='" + arr[i].pic + "' style='width: 30px; height: 30px; float: right; margin-top: -3px; border-radius: 50%;'/>";
+                b.addEventListener("click", function(e) {
+                    inp.value = this.getElementsByTagName("input")[0].value;
+                    closeAllLists();
+                });
+                a.appendChild(b);
+            }
         }
-      }
-  });
-  function addActive(x) {
-    if (!x) return false;
-    removeActive(x);
-    if (currentFocus >= x.length) currentFocus = 0;
-    if (currentFocus < 0) currentFocus = (x.length - 1);
-    x[currentFocus].classList.add("autocomplete-active");
-  }
-  function removeActive(x) {
-    for (var i = 0; i < x.length; i++) {
-      x[i].classList.remove("autocomplete-active");
+    });
+    inp.addEventListener("keydown", function(e) {
+        var x = document.getElementById(this.id + "autocomplete-list");
+        if (x) x = x.getElementsByTagName("div");
+        if (e.keyCode == 40) {
+            currentFocus++;
+            addActive(x);
+        } else if (e.keyCode == 38) {
+            currentFocus--;
+            addActive(x);
+        } else if (e.keyCode == 13) {
+            e.preventDefault();
+            if (currentFocus > -1) {
+                if (x) x[currentFocus].click();
+            }
+        }
+    });
+
+    function addActive(x) {
+        if (!x) return false;
+        removeActive(x);
+        if (currentFocus >= x.length) currentFocus = 0;
+        if (currentFocus < 0) currentFocus = (x.length - 1);
+        x[currentFocus].classList.add("autocomplete-active");
     }
-  }
-  function closeAllLists(elmnt) {
-    var x = document.getElementsByClassName("autocomplete-items");
-    for (var i = 0; i < x.length; i++) {
-      if (elmnt != x[i] && elmnt != inp) {
-        x[i].parentNode.removeChild(x[i]);
-      }
+
+    function removeActive(x) {
+        for (var i = 0; i < x.length; i++) {
+            x[i].classList.remove("autocomplete-active");
+        }
     }
-  }
-  document.addEventListener("click", function (e) {
-      closeAllLists(e.target);
-  });
+
+    function closeAllLists(elmnt) {
+        var x = document.getElementsByClassName("autocomplete-items");
+        for (var i = 0; i < x.length; i++) {
+            if (elmnt != x[i] && elmnt != inp) {
+                x[i].parentNode.removeChild(x[i]);
+            }
+        }
+    }
+    document.addEventListener("click", function(e) {
+        closeAllLists(e.target);
+    });
 }
 
 function persistentFunc() {
@@ -894,7 +902,7 @@ function insufficientOrder() {
             if (e.status == "ok") {
                 $("#insufficientOrderStatus").html('Transaction code confirmed successfully');
                 $("#insufficientOrderStatus").css("color", "green");
-		    $("#buyStoreTokens").modal("close");
+                $("#buyStoreTokens").modal("close");
             } else {
                 $("#insufficientOrderStatus").html('Error! Enter transaction code again.');
                 $("#insufficientOrderStatus").css("color", "red");

js/custom-script.js

@@ -112,11 +112,18 @@ angular.module('sokoApp', [])
         switchTo(getBitsWinOpt('page'))
         if (getBitsWinOpt('page') == 'packaging') {
             showPackagingPage();
+            wrappingBagModal('wrappingBagModal')
             fetchPackagingOrders();
             if(getBitsWinOpt('sel')=="wraps"){
                 $('#wrappingBagModal').modal('open')
             }
         }
+        if (getBitsWinOpt('page') == 'inventory') {
+            openInventoryPage();
+            if(getBitsWinOpt('sel')=="add"){
+                $('#spnsrdModal').modal('open');
+            }
+        }
     }
 
 

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/inventory.js

@@ -15,24 +15,37 @@ function sponpProdNamesInput() {
     var inputVal = $("#check-prod-input").val();
     var fetchedData = doFetch({
         action: 'getAllProducts',
-        data: inputVal,
+        data: '',
         filter: 'sponsored'
     }).then(function(e) {
         var dat = {}
         var itemDat = new Array();
         sponProds = e.products;
-        for (var iii in e.products) {
-            var nm = e.products[iii].name + " - " + e.products[iii].price;
-            var icn = e.products[iii].icon;
-            var itemName = e.products[iii].name
-            //var id = e.users[iii].id;
-            dat[nm] = icn;
-            itemDat.push(itemName)
+        $('.inventoryItemsToAdd').html('');
+        for (var iii in sponProds) {
+            var itemName = sponProds[iii].name;
+            var itemPrice = sponProds[iii].price;
+            var itemId = sponProds[iii].id;
+            var itemIcon = sponProds[iii].icon;
+            if (itemName.toLowerCase() == "eggs") {
+                $('.inventoryItemsToAdd').append('<form action="#" style="padding-right: 20px;"> <p> <label> <input class="inventoryItems" type="checkbox" pid="' + itemId + '" id="inventoryItem' + itemId + '"/> <span><img src="' + itemIcon + '" style=" width: 25px; height: 25px; object-fit: cover; border-radius: 50%; float: left; margin-right: 10px;">' + itemName + '  @ ' + itemPrice + ' per tray</span> </label> </p></form>');
+            }
+            if (itemName.toLowerCase() == "potatoes") {
+                $('.inventoryItemsToAdd').append('<form action="#" style="padding-right: 20px;"> <p> <label> <input class="inventoryItems" type="checkbox" pid="' + itemId + '" id="inventoryItem' + itemId + '"/> <span><img src="' + itemIcon + '" style=" width: 25px; height: 25px; object-fit: cover; border-radius: 50%; float: left; margin-right: 10px;">' + itemName + ' @ ' + itemPrice + ' per kg</span> </label> </p></form>');
+            }
 
+            if (invetoryItemsInStore.includes(itemId) == true) {
+                $('#inventoryItem' + itemId + '').attr('checked', true);
+            }
         }
-        autocomplete(document.getElementById("check-prod-input"), itemDat);
 
     });
+    var remainingTime = 7 - moment().format("d");
+    if (remainingTime == 1) {
+        document.getElementById('invetoryEndDate').innerHTML = remainingTime + " day";
+    } else {
+        document.getElementById('invetoryEndDate').innerHTML = remainingTime + " days";
+    }
 }
 
 //Process Inventory Order
@@ -62,3 +75,59 @@ function inventoryOrder(prid) {
         })
     }
 }
+
+
+
+$(document).on('click touchstart', '.inventoryItems', function(e) {
+    var getId = $(this).attr('pid');
+    var isChecked = $('#inventoryItem' + getId).prop('checked');
+    if (isChecked == true) {
+        M.toast({
+            html: 'Adding item to inventory',
+            classes: 'spnsrdTst',
+            displayLength: 10000
+        })
+        doFetch({
+            action: 'addSponsoredProduct',
+            store: localStorage.getItem('soko-active-store'),
+            do: 'add',
+            id: getId
+        }).then(function(e) {
+            if (e.status == 'ok') {
+                $(".spnsrdTst").remove();
+                $('#spnsrdModal').modal('close');
+                M.toast({
+                    html: 'Item added to inventory successfully',
+                    displayLength: 3000
+                })
+            } else {}
+        });
+    } else {
+        $("#rmvSpnsrdProd").attr("sid", getId)
+        $("#rmvSpnsrdProd").css('display', 'block');
+        $('#inventoryItem' + getId).prop('checked', true);
+        $(document).on('touchstart click', '#yesSponsoredBtn', function(event) {
+            var sponsoredID = $("#rmvSpnsrdProd").attr("sid");
+            $(this).unbind(event);
+            doFetch({
+                action: 'removeSponsoredProduct',
+                store: localStorage.getItem('soko-active-store'),
+                do: 'remove',
+                id: sponsoredID
+            }).then(function(e) {
+                if (e.status == 'ok') {
+                    $("#rmvSpnsrdProd").hide();
+                    $('#inventoryItem15').prop('checked', false);
+                    M.toast({
+                        html: 'Inventory item removed successfully',
+                        displayLength: 3000
+                    })
+                } else {}
+            });
+        });
+    }
+})
+
+$(document).on('touchstart click', '#noSponsoredBtn', function(event) {
+    $("#rmvSpnsrdProd").hide();
+});

js/packaging.js

@@ -10,6 +10,7 @@ function packagingDataArray() {
     promise1 = new Promise(function(resolve, reject) {
         var packagingDataArray = {};
         var wrappingBagDataArray = {};
+        var nonSealableDataArray = {};
         if (packagingType == "paperBag") {
             if ($("#smallPaperbag").prop("disabled") == false) {
                 packagingDataArray["small"] = $("#smallPaperbag").val();
@@ -27,6 +28,23 @@ function packagingDataArray() {
                 packagingDataArray["large"] = "0"
             }
             resolve(packagingDataArray);
+        } else if (packagingType == 'nonSealable') {
+            if ($("#nonSealableSmall-3").prop("disabled") == false) {
+                nonSealableDataArray["small"] = $("#nonSealableSmall-3").val();
+            } else {
+                nonSealableDataArray["small"] = "0"
+            }
+            if ($("#nonSealableMeduim-5").prop("disabled") == false) {
+                nonSealableDataArray["medium"] = $("#nonSealableMeduim-5").val();
+            } else {
+                nonSealableDataArray["medium"] = "0"
+            }
+            if ($("#nonSealableLarge-8").prop("disabled") == false) {
+                nonSealableDataArray["large"] = $("#nonSealableLarge-8").val();
+            } else {
+                nonSealableDataArray["large"] = "0"
+            }
+            resolve(nonSealableDataArray);
         } else {
             if ($("#wrappingBagTiny").prop("checked") == true) {
                 wrappingBagDataArray["tiny-1"] = $("#wrappingTiny-1").val()
@@ -108,7 +126,7 @@ function packagingData() {
             });
         } else {
             //creditTopup = $(".packPrice").html();
-            var totalInsufficient = JSON.stringify(parseInt(numberify($('.packPrice').html().replace(/[^0-9\.]+/g, ''))) + parseInt(numberify(delPrice)))
+            var totalInsufficient = $('.packPrice').html().replace(/[^0-9\.]+/g, '')
             getInsufficientFundsOrderbook(totalInsufficient).then(function(r) {
 
                 doFetch({
@@ -146,7 +164,10 @@ function packagingTotalCost() {
     var smallWrappingBag = $("#wrappingSmall-3").val() * 3
     var meduiumWrappingBag = $("#wrappingMeduim-5").val() * 5
     var largeWrappingBag = $("#wrappingLarge-8").val() * 7
-    var exLargeWrappingBag = $("#wrappingLarge-8").val() * 9
+    var exLargeWrappingBag = $("#wrappingLarge-9").val() * 9
+    var smallNonSealable = $("#nonSealableSmall-3").val() * 1
+    var mediumNonSealable = $("#nonSealableMeduim-5").val() * 3
+    var largeNonSealable = $("#nonSealableLarge-8").val() * 5
 
     if (packagingType == 'paperBag') {
         if ($("#smallPaperbag").prop("disabled") == true) {
@@ -161,6 +182,19 @@ function packagingTotalCost() {
         var totalCost = smallPack + mediumPack + largePack
         $(".packPrice").html(parseInt(totalCost) + parseInt(numberify(delPrice)) + " " + baseCd);
         $(".packPriceVal").html(totalCost + " " + baseCd);
+    } else if (packagingType == 'nonSealable') {
+        if ($("#nonSealableSmall-3").prop("disabled") == true) {
+            smallNonSealable = 0
+        }
+        if ($("#nonSealableMeduim-5").prop("disabled") == true) {
+            mediumNonSealable = 0
+        }
+        if ($("#nonSealableLarge-8").prop("disabled") == true) {
+            largeNonSealable = 0
+        }
+        var totalCost = smallNonSealable + mediumNonSealable + largeNonSealable
+        $(".packPrice").html(parseInt(totalCost) + parseInt(numberify(delPrice)) + " " + baseCd);
+        $(".packPriceVal").html(totalCost + " " + baseCd);
     } else {
         if ($("#wrappingBagTiny").prop("checked") == false) {
             tinyWrappingBag = 0
@@ -245,6 +279,7 @@ function fetchPackagingOrders() {
         if (e.data.length == 0) {} else {
             $('.packagingContainer').html('');
             var orderData = e.data;
+            console.log(orderData.length)
             var allItems = 0
             for (order in orderData) {
                 if (orderData[order].type == "paperBag") {
@@ -260,7 +295,6 @@ function fetchPackagingOrders() {
                     testArray.push(items[sizes])
                 }
                 packagingArrayItems(testArray, itemsSize)
-
                 function packagingArrayItems(itm, size) {
                     var nums = itm
                     var sum = 0;
@@ -270,8 +304,6 @@ function fetchPackagingOrders() {
                         sum += parseInt(nums[i]);
 
                     }
-
-                    console.log();
                     $('.packagingContainer').append('<div class="row" style="width: 100%; display: block; margin-left: auto; margin-right: auto;"><div class="col s12 m6"> <div class="card"> <span class="card-title" style="border-bottom: solid #cecbcb 1px; display: block; padding: 5px 10px; font-size: 1em; font-weight: bold;">' + orderData[order].type + '</span> <div class="card-content" style="padding: 10px;"><div class="packagingSizes"></div> <p style="font-weight: bold; color: #545252;">Status: <span style="font-weight: normal;">' + orderData[order].status + '</span></p><p style="font-weight: bold; color: #545252;">No. of Items: <span style="font-weight: normal;">' + sum + '</span></p><p style="font-weight: bold; color: #545252;">Total Price: <span style="font-weight: normal;">0 kes</span></p></div></div></div></div>');
                 }
 

js/promo.js

@@ -11,7 +11,7 @@ function refreshPromotions() {
             var allPromo = promoSubsId[i].promoSubs;
 
             for (var s = 0; s < allPromo.length; s++) {
-                console.log('[++++++++++++++]' + promoSubsId[i].id + allPromo[s].id)
+                // console.log('[++++++++++++++]' + promoSubsId[i].id + allPromo[s].id)
             }
         }
         if (e.status == 'ok') {
@@ -270,17 +270,20 @@ function promoCreator(proId) {
             // $(".promo-add-new-promotion-" + proId).html('');
 
             for (var i = 0, proId = proId; i < e.length; ++i) {
-
-                var itemsInPromo = JSON.parse(promoSubsId[i].promoItems)
-                $('.promoItems-' + promoSubsId[i].id).html('')
-                for (items in itemsInPromo) {
-                    for (var ii = 0; ii < getAllProducts.length; ii++) {
-                        var prdId = getAllProducts[ii].id
-                        var prodName = getAllProducts[ii].name
-                        if (prdId == itemsInPromo[items]) {
-                            $('.promoItems-' + promoSubsId[i].id).append('<li style="display: inline-block;"><div class="chip">' + prodName + '</div></li>')
+                try {
+                    var itemsInPromo = JSON.parse(promoSubsId[i].promoItems)
+                    $('.promoItems-' + promoSubsId[i].id).html('')
+                    for (items in itemsInPromo) {
+                        for (var ii = 0; ii < getAllProducts.length; ii++) {
+                            var prdId = getAllProducts[ii].id
+                            var prodName = getAllProducts[ii].name
+                            if (prdId == itemsInPromo[items]) {
+                                $('.promoItems-' + promoSubsId[i].id).append('<li style="display: inline-block;"><div class="chip">' + prodName + '</div></li>')
+                            }
                         }
                     }
+                } catch (err) {
+                    console.log(err)
                 }
 
                 $("#prodEdit_" + e[i].id).change(function() {

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>");
     }
 }