Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/IZYIM into aqeeb/fixbug

# Conflicts:
#	assets/modul-js/orders/shipping-order/create.js
#	modul/arrangements/warehouse/init.php

.gitignore

@@ -1 +1,2 @@
-.htaccess
+.htaccess
+**/logs

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for XDebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000
+        },
+        {
+            "name": "Launch currently open script",
+            "type": "php",
+            "request": "launch",
+            "program": "${file}",
+            "cwd": "${fileDirname}",
+            "port": 9000
+        }
+    ]
+}

assets/global/plugins/bootstrap/css/bootstrap.css

@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "UTF-8";
 /*!
  * Bootstrap v3.3.7 (http://getbootstrap.com)
  * Copyright 2011-2016 Twitter, Inc.
@@ -2703,7 +2703,7 @@ select[multiple].input-lg,
   display: block;
   margin-top: 5px;
   margin-bottom: 10px;
-  color: #737373; }
+  color: #FF0000; }
 
 @media (min-width: 768px) {
   .form-inline .form-group {

assets/layouts/layout/css/layout.css

@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "UTF-8";
 /* Cubic Bezier Transition */
 @media print {
   body {
@@ -67,7 +67,9 @@ Page Header
       display: inline-block;
       float: left; }
     .page-header.navbar .page-logo .logo-default {
-      margin: 18px 0 0 0; }
+      width:60px; 
+      margin-left:35px;
+}
     .page-header.navbar .page-logo .logo-mini {
       display: none;
       margin-left: 5px; }

assets/modul-js/orders/shipping-order/create.js

@@ -172,6 +172,15 @@ var TableDatatablesEditable = function() {
                         packaging_quantity: {
                             required: true,
 
+
+
+                    },
+                    packaging_type1:{
+                        required: true,
+
+                    },
+                    total_cartons:{
+                        required: true,
                     },
                     messages: {
                         description: {
@@ -212,7 +221,7 @@ var TableDatatablesEditable = function() {
 								.addClass('valid') // mark the current input as valid and display OK icon
 								.closest('.form-group').removeClass('has-error').addClass('has-success'); // set success class to the control group
 						}
-					}
+					}}
 				});
 				success.hide();
 				error.hide();

includes/func.class/logs/2018-03-15.txt

@@ -1,3 +0,0 @@
-Time : 13:55:05
-SQLSTATE[HY093]: Invalid parameter number
-Raw SQL : SELECT * FROM users WHERE username= :username  && status = 1 && reset_token= :reset_token

includes/func.class/logs/2018-03-26.txt

@@ -1,43 +0,0 @@
-Time : 18:02:06
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 18:02:05
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:57:23
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:57:17
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:56:52
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:53:06
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:52:08
-SQLSTATE[42S02]: Base table or view not found: 1146 Table 'izyim.users' doesn't exist
-Raw SQL : SELECT * FROM users WHERE username= :username
-
-Time : 17:51:30
-SQLSTATE[42S02]: Base table or view not found: 1146 Table 'izyim.users' doesn't exist
-Raw SQL : SELECT * FROM users WHERE username= :username
-
-Time : 17:51:20
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:51:00
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:50:53
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:49:08
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:49:08
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:48:56
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)

includes/func.class/logs/2018-03-27.txt

@@ -1,2 +0,0 @@
-Time : 18:20:59
-SQLSTATE[HY000] [2002] Can't connect to local MySQL server through socket '/Applications/AMPPS/var/mysql.sock' (2)

includes/tpl/head.php

@@ -93,7 +93,7 @@ License: You must have a valid license purchased only from themeforest(the above
                 <div class="page-header-inner ">
                     <!-- BEGIN LOGO -->
                     <div class="page-logo">
-                        <a href="index.html">
+                        <a href="/dashboard">
                             <img src="/assets/layouts/layout/img/logo.png" alt="logo" class="logo-default" /> </a>
                         <div class="menu-toggler sidebar-toggler">
                             <span></span>

modul/arrangements/shipment/init.php

@@ -32,7 +32,7 @@ function create_shipment_arrangement_js() {
 	<script src="/assets/global/plugins/bootstrap-timepicker/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
 	<script src="/assets/global/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
 	<script src="/assets/global/plugins/clockface/js/clockface.js" type="text/javascript"></script>
-	<script src="/assets/modul-js/arrangements/shipment-arrangement/create.min.js" type="text/javascript"></script>
+	<script src="/assets/modul-js/arrangements/shipment-arrangement/create.js" type="text/javascript"></script>
  <?php
 }
 

modul/arrangements/warehouse/init.php

@@ -213,7 +213,6 @@ function the_warehouse_arrangement(){
 				$db->bind("image", $warehouse_arrangement_item['image']);
 				$db->bind("so_item_id", $warehouse_arrangement_item['so_item_id']);
 				$db->bind("warehouse_arrangement_id", $warehouse_arrangement_id);
-
 				$warehouse_arrangement_itemsCreate = $db->query("INSERT INTO warehouse_arrangement_items (actual_ctn, actual_measurement_ctn, actual_weight_ctn, actual_height_ctn, actual_width_ctn, actual_depth_ctn, status, isDamaged, image, so_item_id, warehouse_arrangement_id) VALUES (:actual_ctn, :actual_measurement_ctn, :actual_weight_ctn, :actual_height_ctn, :actual_width_ctn, :actual_depth_ctn, :status, :isDamaged, :image, :so_item_id, :warehouse_arrangement_id);");
 
 				if($warehouse_arrangement_item['status'] == 1 || $warehouse_arrangement_item['isDamaged'] == 1){

modul/common/company/init.php

@@ -594,7 +594,9 @@ function the_company() {
 		
 		if (move_uploaded_file($_FILES['image']['tmp_name'], $uploadfile)) {
 			$path =  'http://' . $_SERVER['HTTP_HOST'].'/uploads/company/'.$_SESSION['user_id']."/".basename($uploadfile);
+			$uploaded_img = $_FILES['image']['tmp_name'];
 			$data = file_get_contents($path);
+
 			$logo = 'data:' . $_FILES['image']['type'] . ';base64,' . base64_encode($data);
 			$logo_mime = $_FILES['image']['type'];
 			$company_id = getCompany($_SESSION['user_id']);
@@ -602,17 +604,20 @@ function the_company() {
 			$db->bind("logo_mime", $logo_mime);
 			$db->bind("company_id", $company_id);
 			
+			return $logo;
 			$imageupdate = $db->query("UPDATE companies SET logo = :logo, logo_mime= :logo_mime WHERE company_id = :company_id");
 		}
 		
 		if ($imageupdate) {
 			action_log($_SESSION['user_id'], "Edit Logo : ID - " . $company_id , "SUCCESS");
 			delete_directory(__DIR__ ."/../../../uploads/");
-			return $app->redirect($referer.'?success');
+			
+			
 		} else {
 			action_log($_SESSION['user_id'], "Edit Logo : ID - " . $company_id , "FAILED");
 			delete_directory(__DIR__ ."/../../../uploads/");
-			return $app->redirect($referer.'?failed');
+			
+			//return $app->redirect($referer.'?failed');
 		}
     });
 	

modul/common/profile/init.php

@@ -109,7 +109,8 @@ function the_profile() {
 			$profile_picture_mime = $_FILES['image']['type'];
 			$db->bind("profile_picture", $profile_picture);
 			$db->bind("profile_picture_mime", $profile_picture_mime);
-			$db->bind("user_id", $_SESSION["user_id"]);
+            $db->bind("user_id", $_SESSION["user_id"]);
+            
 			
 			$imageupdate = $db->query("UPDATE user_detail SET profile_picture = :profile_picture, profile_picture_mime= :profile_picture_mime WHERE user_id = :user_id");
 		}

modul/orders/shipping-order/create.tpl.php

@@ -368,8 +368,15 @@
 																<input type="number" name="packaging_quantity" id="packaging_quantity" placeholder="30" class="form-control int" required>
 															</div>
 														</div>
+														<div class="form-group">
+															<label class="control-label col-md-3">Total Cartons<span class="required"> * </span>
+															</label>
+															<div class="col-md-4">
+																<input type="number" name="total_cartons" id="total_cartoons" placeholder="30" class="form-control int" required>
+															</div>
+														</div>
 														<div class="form-group" id="pack_type">
-															<label class="control-label col-md-3">Packaging Type</label>
+															<label class="control-label col-md-3">Packaging Type<span class="required"> * </span></label>
 															<div class="col-md-6">
 																<select name="packaging_type1" id="packaging_type1" class="form-control">
 																	<option value="">Please choose Packaging Type</option>
@@ -379,6 +386,7 @@
 																	<option value="Sacks">Sacks</option>
 																	<option value="new">Add New</option>
 																</select>
+																
 															</div>
 														</div>
 														<div class="form-group" id="pack_type_uom">

modul/orders/shipping-order/init.php

@@ -36,7 +36,7 @@ function create_so_js() {
 	<script src="/assets/global/scripts/datatable.js" type="text/javascript"></script>
 	<script src="/assets/global/plugins/datatables/datatables.min.js" type="text/javascript"></script>
 	<script src="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.js" type="text/javascript"></script>
-	<script src="/assets/modul-js/orders/shipping-order/create.min.js?v=<?php echo rand(); ?>" type="text/javascript"></script>
+	<script src="/assets/modul-js/orders/shipping-order/create.js?v=<?php echo rand(); ?>" type="text/javascript"></script>
  <?php
 }
 function so_js() {
@@ -328,6 +328,7 @@ function the_so(){
 				$db->bind("item_code", $shippingorderitem['item_code']);
 				$db->bind("uom", $shippingorderitem['uom']);
 				$db->bind("quantity", $shippingorderitem['quantity']);
+				$db->bind("total_cartons", $shippingorderitem['total_cartons']);
 				$db->bind("packaging_quantity", $shippingorderitem['packaging_quantity']);
 				$db->bind("packaging_cbm", $shippingorderitem['packaging_cbm']);
 				if($shippingorderitem['packaging_type1'] == "new"){
@@ -346,7 +347,7 @@ function the_so(){
 				$db->bind("image4", ($shippingorderitem['image4'] <> "" ? $shippingorderitem['image4']  : NULL));
 				$db->bind("so_id", $so_id);
 				
-				$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :image, :image2, :image3, :image4, :so_id);");
+				$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity,total_cartons, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity,:total_cartons, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :image, :image2, :image3, :image4, :so_id);");
 			}
 		}