From bc9eabe0696166cc2f4e1bd0b046fefc364cb717 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Tue, 4 Sep 2018 12:41:16 +0500 Subject: [PATCH 01/14] add file of insert Brand --- admin/insert_brand.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 admin/insert_brand.php diff --git a/admin/insert_brand.php b/admin/insert_brand.php new file mode 100644 index 0000000..e0086f6 --- /dev/null +++ b/admin/insert_brand.php @@ -0,0 +1,15 @@ + +
+ +Insert New Bran: + + + +
\ No newline at end of file From 7b143dc53fbc978e873e62ffafedcde928d43fc7 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Tue, 4 Sep 2018 18:35:55 +0500 Subject: [PATCH 02/14] add file of insert category --- admin/insert_category.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 admin/insert_category.php diff --git a/admin/insert_category.php b/admin/insert_category.php new file mode 100644 index 0000000..7164b34 --- /dev/null +++ b/admin/insert_category.php @@ -0,0 +1,16 @@ + + +
+ + Insert New Category: + + + +
From 52b4aafa2f26d1ce4f84f9ea706cd02b92976a36 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Tue, 4 Sep 2018 19:12:26 +0500 Subject: [PATCH 03/14] add files in admin panel --- admin/index.php | 8 ++++---- admin/insert_brand.php | 2 +- admin/view_brands.php | 23 +++++++++++++++++++++++ admin/view_categories.php | 22 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 admin/view_brands.php create mode 100644 admin/view_categories.php diff --git a/admin/index.php b/admin/index.php index 29e7a82..a6fff37 100644 --- a/admin/index.php +++ b/admin/index.php @@ -29,16 +29,16 @@
  • - Insert New Category + Insert New Category
  • - View All Categories + View All Categories
  • - Insert New Brand + Insert New Brand
  • - View All Brands + View All Brands
  • View Customers diff --git a/admin/insert_brand.php b/admin/insert_brand.php index e0086f6..687fc8a 100644 --- a/admin/insert_brand.php +++ b/admin/insert_brand.php @@ -6,7 +6,7 @@ * Time: 12:35 PM */ ?> -
    + Insert New Bran: diff --git a/admin/view_brands.php b/admin/view_brands.php new file mode 100644 index 0000000..df1588d --- /dev/null +++ b/admin/view_brands.php @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + +

    View All Brands Here

    Brand IdBrand NameEditDelete
    diff --git a/admin/view_categories.php b/admin/view_categories.php new file mode 100644 index 0000000..025aacd --- /dev/null +++ b/admin/view_categories.php @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + +

    View All Categories Here

    categories titlecategories idEditDelete
    From 9028bbf591f7a36160858cf840169101595bc166 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Tue, 4 Sep 2018 19:24:00 +0500 Subject: [PATCH 04/14] add files in admin panel --- admin/index.php | 2 +- admin/view_brands.php | 2 +- admin/view_customers.php | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 admin/view_customers.php diff --git a/admin/index.php b/admin/index.php index a6fff37..a4eb6a6 100644 --- a/admin/index.php +++ b/admin/index.php @@ -41,7 +41,7 @@ View All Brands
  • - View Customers + View Customers
  • View Orders diff --git a/admin/view_brands.php b/admin/view_brands.php index df1588d..d592a5d 100644 --- a/admin/view_brands.php +++ b/admin/view_brands.php @@ -7,7 +7,7 @@ */ ?> - +
    diff --git a/admin/view_customers.php b/admin/view_customers.php new file mode 100644 index 0000000..a33e8a3 --- /dev/null +++ b/admin/view_customers.php @@ -0,0 +1,20 @@ + +

    View All Brands Here

    + + + + + + + + + + +

    View All Customers Here

    Serial NONameEmailImagesDelete
    From 4b62e89151e1f239a5529ae3b1fa6c00b4734665 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Tue, 4 Sep 2018 19:29:59 +0500 Subject: [PATCH 05/14] add files in admin panel --- admin/index.php | 2 +- admin/view_orders.php | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 admin/view_orders.php diff --git a/admin/index.php b/admin/index.php index a4eb6a6..43283a3 100644 --- a/admin/index.php +++ b/admin/index.php @@ -44,7 +44,7 @@ View Customers
  • - View Orders + View Orders
  • View Payments diff --git a/admin/view_orders.php b/admin/view_orders.php new file mode 100644 index 0000000..8070523 --- /dev/null +++ b/admin/view_orders.php @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + +

    View All Customers Here

    Serial NOProductQuantityInvoice NoOrder DateAction
    From bb76ca481928093fd86ef23e6fa043682d050db7 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Thu, 6 Sep 2018 15:04:25 +0500 Subject: [PATCH 06/14] Merge remote-tracking branch 'upstream/master' # Conflicts: # admin/view_brands.php # admin/view_categories.php # admin/view_customers.php --- admin/index.php | 37 +++++---- admin/insert_brand.php | 15 ---- admin/insert_category.php | 16 ---- admin/insert_product.php | 155 +++++++++++++++++++------------------- admin/view_orders.php | 22 ------ 5 files changed, 94 insertions(+), 151 deletions(-) delete mode 100644 admin/insert_brand.php delete mode 100644 admin/insert_category.php delete mode 100644 admin/view_orders.php diff --git a/admin/index.php b/admin/index.php index fdce756..7de0707 100644 --- a/admin/index.php +++ b/admin/index.php @@ -33,22 +33,22 @@
  • - Insert New Category + Insert New Category
  • - View All Categories + View All Categories
  • - Insert New Brand + Insert New Brand
  • - View All Brands + View All Brands
  • - View Customers + View Customers
  • - View Orders + View Orders
  • View Payments @@ -67,20 +67,17 @@
    - +
    diff --git a/admin/insert_brand.php b/admin/insert_brand.php deleted file mode 100644 index 687fc8a..0000000 --- a/admin/insert_brand.php +++ /dev/null @@ -1,15 +0,0 @@ - - - -Insert New Bran: - - - - \ No newline at end of file diff --git a/admin/insert_category.php b/admin/insert_category.php deleted file mode 100644 index 7164b34..0000000 --- a/admin/insert_category.php +++ /dev/null @@ -1,16 +0,0 @@ - - -
    - - Insert New Category: - - - -
    diff --git a/admin/insert_product.php b/admin/insert_product.php index d2d6beb..07e1bbe 100644 --- a/admin/insert_product.php +++ b/admin/insert_product.php @@ -1,82 +1,81 @@ -
    -
    -
    -
    -

    Insert New Product

    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    + + + + Inserting Product + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Insert New Product here

    Product Title:
    Product Category: + +
    Product Brand: + +
    Product Image:
    Product Price:
    Product Description:
    Product Keywords:
    +
    -
    -
    + + + - - - - - - - - - - - - - -

    View All Customers Here

    Serial NOProductQuantityInvoice NoOrder DateAction
    From 2b454a5ff89bca5808ae4439296501aa416d49db Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Thu, 6 Sep 2018 15:10:45 +0500 Subject: [PATCH 07/14] Merge remote-tracking branch 'upstream/master' # Conflicts: # admin/view_brands.php # admin/view_categories.php # admin/view_customers.php --- admin/index.php | 25 ++++--- admin/insert_product.php | 155 ++++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 88 deletions(-) diff --git a/admin/index.php b/admin/index.php index 7de0707..282da5b 100644 --- a/admin/index.php +++ b/admin/index.php @@ -67,17 +67,20 @@
    - +
    diff --git a/admin/insert_product.php b/admin/insert_product.php index 07e1bbe..d2d6beb 100644 --- a/admin/insert_product.php +++ b/admin/insert_product.php @@ -1,81 +1,82 @@ - - - - Inserting Product - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Insert New Product here

    Product Title:
    Product Category: - -
    Product Brand: - -
    Product Image:
    Product Price:
    Product Description:
    Product Keywords:
    - +
    +
    + +
    +

    Insert New Product

    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    - - - +
    +
    Date: Thu, 6 Sep 2018 16:23:29 +0500 Subject: [PATCH 08/14] quiz --- admin/view_products.php | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 admin/view_products.php diff --git a/admin/view_products.php b/admin/view_products.php new file mode 100644 index 0000000..ea7895e --- /dev/null +++ b/admin/view_products.php @@ -0,0 +1,54 @@ + +

    All Products

    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    IDProduct TitleProduct CategoriesPriceImageEditDelete
    EditDelete
    From d668b99ac34bd6a65026caa5e3e6ed33088a983a Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Thu, 6 Sep 2018 16:38:55 +0500 Subject: [PATCH 09/14] Error occure in database conection error is (Undefined variable: con in) --- admin/view_products.php | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/admin/view_products.php b/admin/view_products.php index ea7895e..376a066 100644 --- a/admin/view_products.php +++ b/admin/view_products.php @@ -22,33 +22,25 @@ - - - - - - Edit - Delete + echo " + $pro_id + $pro_cat + $pro_title + $pro_price + + "; + } + ?> - - From 992ebb48d87ef2a32cb332260c0e41e645e2fa13 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Thu, 6 Sep 2018 19:06:13 +0500 Subject: [PATCH 10/14] quiz --- admin/view_products.php | 47 ++--------------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/admin/view_products.php b/admin/view_products.php index 376a066..8123be0 100644 --- a/admin/view_products.php +++ b/admin/view_products.php @@ -1,46 +1,3 @@ -

    All Products

    - -
    -
    - - - - - - - - - - - - - - - - - - "; - } - ?> - - - -
    IDProduct TitleProduct CategoriesPriceImageEditDelete
    $pro_id$pro_cat$pro_title$pro_price
    +

    Categories

    +
      \ No newline at end of file From d9de7ef37f4010c7c01e87fc751727f7d9d6fbb6 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Thu, 6 Sep 2018 19:38:37 +0500 Subject: [PATCH 11/14] quiz --- admin/view_products.php | 47 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/admin/view_products.php b/admin/view_products.php index 8123be0..a9daaaf 100644 --- a/admin/view_products.php +++ b/admin/view_products.php @@ -1,3 +1,44 @@ -

      All Products

      -

      Categories

      -
        \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + +

        View All Products Here

        S.NTitleImagePriceEditDelete
        EditDelete
        \ No newline at end of file From d02699902cc9f423a366f64109a8a7d7c0c61106 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Thu, 6 Sep 2018 19:39:43 +0500 Subject: [PATCH 12/14] quiz --- admin/view_products.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/admin/view_products.php b/admin/view_products.php index a9daaaf..9958321 100644 --- a/admin/view_products.php +++ b/admin/view_products.php @@ -15,13 +15,9 @@ From 72851f7edf2cc7a46717d9461ce75365e2d30ded Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Thu, 6 Sep 2018 19:41:21 +0500 Subject: [PATCH 13/14] quiz issue --- admin/view_products.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/view_products.php b/admin/view_products.php index 9958321..d6a28cc 100644 --- a/admin/view_products.php +++ b/admin/view_products.php @@ -1,5 +1,5 @@ - - +//there is issue that our page run as view_product.php +
        From f9f5574c8159345419e3901ff09a957b39288429 Mon Sep 17 00:00:00 2001 From: Fahad Ali Date: Mon, 10 Sep 2018 11:35:49 +0500 Subject: [PATCH 14/14] changes --- admin/index.php | 63 ++++++++++++++++++++++----- admin/view_brands.php | 50 ++++++++++++++++------ admin/view_categories.php | 50 ++++++++++++++++------ admin/view_customers.php | 82 +++++++++++++++++++----------------- admin/view_products.php | 89 ++++++++++++++++++++++----------------- 5 files changed, 224 insertions(+), 110 deletions(-) diff --git a/admin/index.php b/admin/index.php index 282da5b..32c44e5 100644 --- a/admin/index.php +++ b/admin/index.php @@ -33,28 +33,39 @@
      • - Insert New Category + + Insert New Category +
      • - View All Categories + + View All Categories +
      • - Insert New Brand + + Insert New Brand +
      • - View All Brands + + View All Brands
      • - View Customers + + View Customers
      • - View Orders + + View Orders
      • - View Payments + + View Payments
      • - Admin logout + + Admin logout
        • @@ -71,15 +82,47 @@ if(isset($_GET['insert_product'])){ include ('insert_product.php'); } + else if(isset($_GET['view_products'])){ + include ('view_products.php'); + } + else if(isset($_GET['edit_pro'])){ + include ('edit_pro.php'); + } + else if(isset($_GET['del_pro'])){ + include ('del_pro.php'); + } else if(isset($_GET['view_categories'])){ include ('view_categories.php'); } - else if(isset($_GET['view_customers'])){ - include ('view_customers.php'); + else if(isset($_GET['insert_category'])){ + include ('insert_category.php'); + } + else if(isset($_GET['edit_cat'])){ + include ('edit_cat.php'); + } + else if(isset($_GET['del_cat'])){ + include ('del_cat.php'); } else if(isset($_GET['view_brands'])) { include('view_brands.php'); } + else if(isset($_GET['insert_brand'])) { + include('insert_brand.php'); + } + else if(isset($_GET['edit_brand'])) { + include('edit_brand.php'); + } + else if(isset($_GET['del_brand'])) { + include('del_brand.php'); + } + else if(isset($_GET['view_customers'])){ + include ('view_customers.php'); + } + else if(isset($_GET['del_customer'])){ + include ('del_customer.php'); + } + + ?> diff --git a/admin/view_brands.php b/admin/view_brands.php index dd3df9c..1c33bd0 100644 --- a/admin/view_brands.php +++ b/admin/view_brands.php @@ -1,12 +1,38 @@ -

        Brands

        -
          - $brand_title"; - } - ?> -
        \ No newline at end of file +
        +
        +

        Brands

        +

        View All Products Here

        + + + + + + + + + + + + + + + + +
        #NameActions
        + Edit + + + Delete + +
        + + \ No newline at end of file diff --git a/admin/view_categories.php b/admin/view_categories.php index c326a31..df95e1d 100644 --- a/admin/view_categories.php +++ b/admin/view_categories.php @@ -1,12 +1,38 @@ -

        Categories

        -
          -$cat_title"; -} -?> -
        +
        +
        +

        Categories

        + + + + + + + + + + + + + + + + + +
        #NameActions
        + Edit + + + Delete + +
        +
        +
        \ No newline at end of file diff --git a/admin/view_customers.php b/admin/view_customers.php index c96822f..32344a2 100644 --- a/admin/view_customers.php +++ b/admin/view_customers.php @@ -1,41 +1,47 @@ -

        Customers

        - -
        -
        +
        +
        +

        Customers

        +
        + - - - - - - - + + + + + - - - - - - - - - - - "; - } - ?> - + + + No Customer found "; + } + else { + $i = 0; + while ($row_cust = mysqli_fetch_array($run_cust)) { + $cust_id = $row_cust['cust_id']; + $cust_name = $row_cust['cust_name']; + $cust_email = $row_cust['cust_email']; + $cust_image = $row_cust['cust_image']; + ?> + + + + + + + + + +
        NameEmailCountryCityContactAddressImage#NameEmailImageActions
        $cust_name$cust_email$cust_country$cust_city$cust_contact$cust_address
        + Delete + +
        - \ No newline at end of file + \ No newline at end of file diff --git a/admin/view_products.php b/admin/view_products.php index d6a28cc..00bfd82 100644 --- a/admin/view_products.php +++ b/admin/view_products.php @@ -1,39 +1,52 @@ -//there is issue that our page run as view_product.php - - - - - - - - - - - - - - - - - - - - - - - +
        +
        +

        Products

        +

        View All Products Here

        S.NTitleImagePriceEditDelete
        EditDelete
        + + + + + + + - -
        #TitleImagePriceActions
        \ No newline at end of file + + + No Product found in selected criteria "; + } + else { + $i = 0; + while ($row_pro = mysqli_fetch_array($run_pro)) { + $pro_id = $row_pro['pro_id']; + $pro_cat = $row_pro['pro_cat']; + $pro_brand = $row_pro['pro_brand']; + $pro_title = $row_pro['pro_title']; + $pro_price = $row_pro['pro_price']; + $pro_image = $row_pro['pro_image']; + ?> + + + + + /- + + Edit + + + Delete + + + + + + + + \ No newline at end of file