Merge dev2 with dev

Modals/Product/Product.html

@@ -223,7 +223,6 @@ <h1>
 <script>
     $(document).ready(function () {
         $('.ui-radio-btn').removeClass('ui-btn');
-        console.log("cc");
 
     });
     $('#plus').unbind('click').bind('click', function () {

common/Cart_N_Delivery_Modal.html

@@ -464,11 +464,10 @@
                 $( "#nav_bar_cart" ).addClass('ui-icon-cart');
                 $( "#nav_bar_cart" ).removeClass('ui-icon-cart-with-items');
                 cartItemsArr = cartItemsArr['items'];
-                console.log(cartItemsArr);
                 $.each(cartItemsArr, function (i, item) {
                     let totalPrice = (item['price'] * item['qty']).toFixed(2);
                     let itemHtml = `
-        <div class="row mb-3" style="margin-left: inherit;margin-right: inherit;">
+        <div class="row mb-3" id="${item['product_id']}"style="margin-left: inherit;margin-right: inherit;">
                 <div class="col-lg-12 col-md-12 col-sm-12 col-12">
                     <div class="row" style="box-shadow: 1px 7px 19px -9px #ec7a23;border-bottom-right-radius: 18px;">
                         <div class="col-lg-8 col-md-8 col-sm-8 col-8">
@@ -480,7 +479,7 @@
                         <div class="col-lg-2 col-md-2 col-sm-2 col-2 btn-edit ui-btn">
                         </div>
 
-                        <div class="col-lg-2 col-md-2 col-sm-2 col-2 ui-btn btn-delete">
+                        <div class="col-lg-2 col-md-2 col-sm-2 col-2 ui-btn btn-delete" onclick="cart_item_remove('${item['product_id']}')">
                         </div>
                     </div>
                 </div>
@@ -492,6 +491,16 @@
                 cartItems = '<p class="text-center">No items available </p>';
             }
             $('#cartItems').html(cartItems);
+            let cartButton = $('#toCheckout');
+            let itemsArr = JSON.parse(sessionStorage.getItem('cartItems'));
+            cartButton.prop('disabled', false);
+            if (itemsArr) {
+                if (itemsArr['items'] === 0) {
+                    cartButton.prop('disabled', true);
+                }
+            } else {
+                cartButton.prop('disabled', true);
+            }
             $("#cart_popup").popup('open');
         } else {
             $('#signin-required-modal').popup('open');
@@ -502,7 +511,7 @@
         sessionStorage.setItem('isBuyNow', '0');
         openDelivery = true;
         popupDeliveryModal();
-    })
+    });
 
     function popupDeliveryModal() {
         let cartModal = $("#cart_popup");
@@ -518,4 +527,36 @@
         });
     }
 
+    function cart_item_remove(id){
+        let cartItemsArrMain = JSON.parse(sessionStorage.getItem('cartItems'));
+        let cartItemsArr = cartItemsArrMain['items'];
+        $.each(cartItemsArr, function (i, item) {
+            if(item['product_id']===id){
+             cartItemsArr = $.grep(cartItemsArr, function(found) {
+                 return found != item;
+             });
+         }
+        });
+        cartItemsArrMain['items']=cartItemsArr;
+        if(cartItemsArr.length===0){
+            sessionStorage.removeItem('cartItems');
+            $('#'+id).addClass('d-none');
+            $('#cartItems').html('<p class="text-center">No items available </p>');
+        }
+        else{
+        sessionStorage.setItem('cartItems', JSON.stringify(cartItemsArrMain));
+        $('#'+id).addClass('d-none');
+        }
+        let cartButton = $('#toCheckout');
+        let itemsArr = JSON.parse(sessionStorage.getItem('cartItems'));
+        cartButton.prop('disabled', false);
+        if (itemsArr) {
+            if (itemsArr['items'] === 0) {
+                cartButton.prop('disabled', true);
+            }
+        } else {
+            cartButton.prop('disabled', true);
+        }
+    }
+
 </script>

data/merchants.json

@@ -4,6 +4,7 @@
 		"merchant_name": "Pizza Zone",
 		"filter_text": "Pizza Zone",
 		"merchantLocation": "Colombo 10",
+		"ratingCount": 9,
 		"sellerDetails": {
 			"seller_id": "S8574",
 			"seller_name": "Kasun Lakmal"
@@ -30,6 +31,7 @@
 		"merchant_name": "Bakery House",
 		"filter_text": "Bakery House",
 		"merchantLocation": "Colombo 11",
+		"ratingCount": 2,
 		"sellerDetails": {
 			"seller_id": "S6585",
 			"seller_name": "Nimal Siri"
@@ -56,6 +58,7 @@
 		"merchant_name": "Burger Hut",
 		"filter_text": "Burger Hut",
 		"merchantLocation": "Colombo 10",
+		"ratingCount": 11,
 		"sellerDetails": {
 			"seller_id": "S8877",
 			"seller_name": "Pasindu Jaye"
@@ -82,6 +85,7 @@
 		"merchant_name": "Salads Corner",
 		"filter_text": "Salads Corner",
 		"merchantLocation": "Colombo 11",
+		"ratingCount": 4,
 		"sellerDetails": {
 			"seller_id": "S8877",
 			"seller_name": "Pasindu Jaye"

data/products.json

@@ -6,7 +6,7 @@
         "product_id": "P001",
         "product_name": "Roast Beef Pizza",
         "filter_text": " RoastBeef Pizza",
-        "product_description": "Roast Beef pizza is good",
+        "product_description": "Roast Beef pizza is has a great blend of cheese with pieces of beef along with a spicy taste.",
         "product_img_path": "../assets/products/pizza-814044.jpg",
         "discount": 10,
         "variant_title": "Size",
@@ -33,7 +33,7 @@
         "product_id": "P002",
         "filter_text": "Vegetable Pizza",
         "product_name": "Vegetable Pizza",
-        "product_description": "Vegetable Pizza is good",
+        "product_description": "Vegetable Pizza is mostly prepared for the vegetarian users with a blend of fresh vegetables.",
         "product_img_path": "../assets/products/pizza-2000600.jpg",
         "discount": "None",
         "variant_title": "Size",
@@ -60,7 +60,7 @@
         "product_id": "P003",
         "product_name": "Seafood Pizza",
         "filter_text": "Seafood Pizza",
-        "product_description": "Seafood pizza is good",
+        "product_description": "Seafood pizza is prepared for the seafood lovers with great taste with prawns, crab meet and cuttlefish rings.",
         "product_img_path": "../assets/products/pizza-3000274.jpg",
         "discount": "None",
         "variant_title": "Size",
@@ -87,7 +87,7 @@
         "product_id": "P004",
         "product_name": "Margherita Pizza",
         "filter_text": "Margherita Pizza",
-        "product_description": "Margherita pizza is good",
+        "product_description": "Margherita pizza has a good good combination of mozzarella cheese along with a topping of pepperoni",
         "product_img_path": "../assets/products/margherita-pizza-993274.jpg",
         "discount": "None",
         "variant_title": "Size",
@@ -118,11 +118,12 @@
   "products": [
     {
       "product_id": "P001",
-      "product_name": "Coffee Doughnut",
-      "filter_text": "Coffee Doughnut",
-      "product_description": "Coffee Doughnut is good",
+      "product_name": "Doughnut",
+      "filter_text": "Doughnut",
+      "product_description": "Doughnut has a great blend of dark coffee taste which is loved by most coffee lovers.",
       "product_img_path": "../assets/products/bakeryHouse/donuts-5815746_640.jpg",
       "variant_title": "Size",
+      "discount": 10,
       "variants": [
         {
           "name": "Small",
@@ -146,7 +147,7 @@
       "product_id": "P002",
         "product_name": "Custard Caramel",
       "filter_text": "Custard Caramel",
-      "product_description": "Custard Caramel is good",
+      "product_description": "Custard Caramel  is a custard dessert with a layer of clear caramel sauce and a hard layer of caramel on top.",
       "product_img_path": "../assets/products/bakeryHouse/cheesecake-1578694_640.jpg",
       "variant_title": "Size",
       "variants": [
@@ -172,7 +173,7 @@
       "product_id": "P003",
       "product_name": "Chocolate Cake",
       "filter_text": "Chocolate Cake",
-      "product_description": "Chocolate Cake is good",
+      "product_description": "Chocolate Cake is is a cake flavored with mostly dark melted chocolate, cocoa powder, served either hot or at normal temperature.",
       "product_img_path": "../assets/products/bakeryHouse/cake-4502270_640.jpg",
       "variant_title": "Size",
       "variants": [
@@ -198,7 +199,7 @@
       "product_id": "P004",
       "product_name": "Multigrain Bread",
       "filter_text": "Multigrain Bread",
-      "product_description": "Multigrain Bread is good",
+      "product_description": "Multigrain Bread is good healthy bread with a whole grain of nutrients preferred by most diet planning customers.",
       "product_img_path": "../assets/products/bakeryHouse/bread-399286_640.jpg",
       "variant_title": "Size",
       "variants": [
@@ -232,6 +233,7 @@
       "product_description": "Chicken Pizza is good",
       "product_img_path": "../assets/products/burgerHut/pizza-chikcen-1949183_640.jpg",
       "variant_title": "Size",
+      "discount": 10,
       "variants": [
         {
           "name": "Small",
@@ -255,7 +257,7 @@
       "product_id": "P002",
       "product_name": "Chicken Burger",
       "filter_text": "Chicken Burger",
-      "product_description": "Chicken Burger is good",
+      "product_description": "Chicken Burger typically consists of boneless, spicy skinless chicken breast served between slices of bread, on a bun.",
       "product_img_path": "../assets/products/burgerHut/chicken-burger-2953388_640.jpg",
       "variant_title": "Size",
       "variants": [
@@ -281,7 +283,7 @@
       "product_id": "P003",
       "product_name": "Beef Burger",
       "filter_text": "Beef Burger",
-      "product_description": "Beef Burger is good",
+      "product_description": "Beef Burger typically consists of spicy roasted beef served between slices of bread, on a bun.",
       "product_img_path": "../assets/products/burgerHut/burger-beef--3962997_640.jpg",
       "variant_title": "Size",
       "variants": [
@@ -307,7 +309,7 @@
       "product_id": "P004",
       "product_name": "Chicken Submarine",
       "filter_text": "Chicken Submarine",
-      "product_description": "Chicken Submarine is good",
+      "product_description": "Chicken Submarine typically consists of boneless, spicy skinless chicken breast served between slices of bread along with cheese and mayonnaise, on a large bun.",
       "product_img_path": "../assets/products/burgerHut/sandwich-451403_640.jpg",
       "variant_title": "Size",
       "variants": [
@@ -336,11 +338,12 @@
     "products": [
       {
         "product_id": "P001",
-        "product_name": "Chicken Mix Salad",
-        "filter_text": "Chicken Mix Salad",
-        "product_description": "Chicken Salad is good",
+        "product_name": "Chicken Salad",
+        "filter_text": "Chicken Salad",
+        "product_description": "Chicken Salad consists of cucumber, salad leaves along with bell pepper served with a great mixture of sauce.",
         "product_img_path": "../assets/products/saladsCorner/spinach-791629_1920.jpg",
         "variant_title": "Size",
+        "discount": 10,
         "variants": [
           {
             "name": "Small",
@@ -364,7 +367,8 @@
         "product_id": "P002",
         "product_name": "Egg Vegi Salad",
         "filter_text": "Egg Vegi Salad",
-        "product_description": "Egg Salad is good",
+        "discount": 15,
+        "product_description": "Egg Salad consists of boiled eggs being cut into small pieces, cucumber, salad leaves along with bell pepper served with a great mixture of sauce.",
         "product_img_path": "../assets/products/saladsCorner/flat-lay-2583212_1920.jpg",
         "variant_title": "Size",
         "variants": [
@@ -390,7 +394,7 @@
         "product_id": "P003",
         "product_name": "Pasta Vegi Salad",
         "filter_text": "Egg Vegi Salad",
-        "product_description": "Pasta Salad is good",
+        "product_description": "Pasta Salad, a refrigerated served salad with pasta mixed with tuna salad along with cucumber, salad leaves along with bell pepper served with a great mixture of sauce",
         "product_img_path": "../assets/products/saladsCorner/close-up-1854245_1920.jpg",
         "variant_title": "Size",
         "variants": [
@@ -416,7 +420,7 @@
         "product_id": "P004",
         "product_name": "Vegetable Salad",
         "filter_text": "Vegetable Salad",
-        "product_description": "Vegetable Salad is good",
+        "product_description": "Vegetable Salad consists of boiled and some freshly cut vegitables along with cucumber, salad leaves along with bell pepper served with a great mixture of sauce",
         "product_img_path": "../assets/products/saladsCorner/salad-498203_1280.jpg",
         "variant_title": "Size",
         "variants": [

data/user.json

@@ -1,6 +1,6 @@
 [
   {
-    "user_id" : "#1",
+    "user_id" : "001",
     "user_name" : "Rahal",
     "user_password" :"#1234",
     "email" :"[email protected]",
@@ -11,25 +11,25 @@
     "favorites_list":[]
   },
   {
-    "user_id" : "#2",
+    "user_id" : "002",
     "user_name" : "Chaveen",
     "user_password" :"#1234",
-    "email" :"Chaveen@gmail.com",
-    "image":"../assets/otherImages/user2.jpg",
+    "email" :"chaveen@gmail.com",
+    "image":"../assets/otherImages/chaveen.jpg",
     "mobile_no" : "0777123456",
-    "user_type": "seller",
+    "user_type": "customer",
     "location": "",
     "favorites_list":[]
   },
   {
-    "user_id" : "#3",
+    "user_id" : "003",
     "user_name" : "Sahan",
     "user_password" :"#4321",
     "email" :"[email protected]",
     "image":"../assets/otherImages/user2.jpg",
     "mobile_no" : "0777123456",
     "user_type": "customer",
-    "location": "Colombo 10",
+    "location": "",
     "favorites_list":[
       {
         "product_id": "P001",
@@ -43,7 +43,7 @@
     ]
   },
   {
-    "user_id" : "#3",
+    "user_id" : "004",
     "user_name" : "Ahamed",
     "user_password" :"#1234",
     "email" :"[email protected]",
@@ -52,5 +52,16 @@
     "user_type": "merchant",
     "location": "Colombo 10",
     "favorites_list":[]
+  },
+  {
+    "user_id" : "005",
+    "user_name" : "homeal",
+    "user_password" :"#1234",
+    "email" :"[email protected]",
+    "image":"../assets/otherImages/Men-Profile-Image.png",
+    "mobile_no" : "0777123456",
+    "user_type": "seller",
+    "location": "",
+    "favorites_list":[]
   }
 ]