Database merge

api/v0/authorization.php

@@ -15,7 +15,7 @@ if (!empty($username) && !empty($password)) {
     $username = strip_tags(trim($username));
     $password = strip_tags(trim($password));
 
-    $conn = new mysqli($db,$dbuser,$dbpw,$dbname_users);
+    $conn = new mysqli($db,$dbuser,$dbpw,$dbname);
             if ($conn->connect_error) {
             die("Connection failed: " . $conn->connect_error);
     }

api/v0/get/authorization.php

@@ -15,7 +15,7 @@ if (!empty($username) && !empty($password)) {
     $username = strip_tags(trim($username));
     $password = strip_tags(trim($password));
 
-    $conn = new mysqli($db,$dbuser,$dbpw,$dbname_users);
+    $conn = new mysqli($db,$dbuser,$dbpw,$dbname);
             if ($conn->connect_error) {
             die("Connection failed: " . $conn->connect_error);
     }

api/v0/get/user_credentials.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // Get user_details based on securitykey
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 //Define Query
 $stmt = $pdo->prepare('SELECT * FROM users WHERE service = ? OR userkey = ?');
 //Excute Query

api/v1/authorization.php

@@ -6,7 +6,7 @@ defined($security_key) or exit;
 //------------------------------------------
 $user_credentials = json_decode(decode_payload($input),true);
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 $username = $user_credentials['username'] ?? '';
 //Define Query
 $stmt = $pdo->prepare('SELECT id, username, password, salesID, partnerhierarchy, view, service, settings, lastlogin, userkey, language FROM users WHERE username = ?');

api/v1/get/accounts.php

@@ -6,7 +6,7 @@ defined($security_key) or exit;
 //------------------------------------------
 
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 
 //SoldTo is empty
 if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}

api/v1/get/authorization.php

@@ -6,7 +6,7 @@ defined($security_key) or exit;
 //------------------------------------------
 $user_credentials = json_decode(decode_payload($input),true);
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 $username = $user_credentials['username'];
 //Define Query
 $stmt = $pdo->prepare('SELECT id, username, password, salesID, partnerhierarchy, view, service, settings, lastlogin, userkey, language FROM users WHERE username = ?');

api/v1/get/partners.php

@@ -6,7 +6,7 @@ defined($security_key) or exit;
 //------------------------------------------
 
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 
 //SoldTo is empty
 if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}

api/v1/get/profile.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // Users
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 //Get user_rights from users.php
 $partner = json_decode($partnerhierarchy);  
 //SoldTo is empty

api/v1/get/user_credentials.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // Get user_details based on securitykey
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 //Define Query
 $stmt = $pdo->prepare('SELECT * FROM users WHERE service = ? OR userkey = ?');
 //Excute Query

api/v1/get/users.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // Users
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 //Get user_rights from users.php
 $partner = json_decode($partnerhierarchy);  
 //SoldTo is empty

api/v1/post/accounts.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // Products
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 $pdo2 = dbConnect($dbname);
 //CONTENT FROM API (POST)
 $post_content = json_decode(decode_payload($input),true);

api/v1/post/application.php

@@ -15,7 +15,7 @@ if ($action !=''){
 //Connect to DB
 //------------------------------------------
 $pdo = dbConnect($dbname);
-$pdo2 = dbConnect($dbname_users);
+$pdo2 = dbConnect($dbname);
 
 //------------------------------------------
 //CONTENT FROM API (POST)
@@ -147,7 +147,7 @@ switch ($action) {
 
                 //Check if shipto is empty and if empty search partner or create
                 if ($partner_equipment->shipto == ''){
-                    $partner_shipto = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
+                    $partner_shipto = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
                     if ($partner_shipto){
                         //Partner exists - Use it
                         $partnerhierarchy['shipto'] = $partner_shipto['partnerID'].'-'.$partnername;
@@ -167,7 +167,7 @@ switch ($action) {
                 }
                 //Check if location is empty and if empty search partner or create
                 if ($partner_equipment->location == ''){
-                    $partner_location = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
+                    $partner_location = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
                     if ($partner_location){
                         //Partner exists - Use it
                         $partnerhierarchy['location'] = $partner_location['partnerID'].'-'.$partnername;
@@ -250,7 +250,7 @@ switch ($action) {
 
             //Check if shipto is empty and if empty search partner or create
             if ($partner_equipment->shipto == ''){
-                $partner_shipto = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
+                $partner_shipto = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
                 if ($partner_shipto){
                     //Partner exists - Use it
                     $partnerhierarchy['shipto'] = $partner_shipto['partnerID'].'-'.$partnername;
@@ -270,7 +270,7 @@ switch ($action) {
             }
             //Check if location is empty and if empty search partner or create
             if ($partner_equipment->location == ''){
-                $partner_location = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
+                $partner_location = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
                 if ($partner_location){
                     //Partner exists - Use it
                     $partnerhierarchy['location'] = $partner_location['partnerID'].'-'.$partnername;

api/v1/post/partners.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // Products
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 
 //CONTENT FROM API (POST)
 $post_content = json_decode(decode_payload($input),true);

api/v1/post/profile.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // users
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 
 //CONTENT FROM API (POST)
 $post_content = json_decode(decode_payload($input),true);

api/v1/post/users.php

@@ -5,7 +5,7 @@ defined($security_key) or exit;
 // users
 //------------------------------------------
 //Connect to DB
-$pdo = dbConnect($dbname_users);
+$pdo = dbConnect($dbname);
 
 //CONTENT FROM API (POST)
 $post_content = json_decode(decode_payload($input),true);

assets/functions.php

@@ -1597,7 +1597,7 @@ else {//ADMIN USERS
       $whereclause = '';
       }
 
-  $pdo = dbConnect($dbname_users);
+  $pdo = dbConnect($dbname);
   $sql = 'SELECT distinct partnerID, partnername FROM partner WHERE partnertype = ? AND status = 1 '.$whereclause.'';
   $stmt = $pdo->prepare($sql);
   $stmt->execute([$partnertype, $condition]);
@@ -1624,6 +1624,55 @@ $view .= '</datalist>
 return $view;
 }
 
+//------------------------------------------
+// LIST ACCOUNTS
+//------------------------------------------
+function listAccounts($type, $user_right, $input)
+{
+  include dirname(__FILE__,2).'/settings/settings.php';
+
+//BASED ON USERRIGHT DEFINE SQL AND DATA RETURNED
+if ($user_right != 3 || $user_right !=4) {
+    //NOT ADMIN USER
+    $partner = json_decode($_SESSION['partnerhierarchy']);
+    //SoldTo is empty
+    if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
+    //BUILD CONDITION
+    $condition = '__salesid___'.$partner->salesid.'___soldto___'.substr($partner->soldto, 0, strpos($partner->soldto, "-")).$soldto_search;
+    $whereclause = 'AND salesID like ?';
+}
+else {//ADMIN USERS
+      $whereclause = '';
+      }
+
+  $pdo = dbConnect($dbname);
+  $sql = 'SELECT distinct partnerID, partnername FROM partner WHERE partnertype = ? AND status = 1 '.$whereclause.'';
+  $stmt = $pdo->prepare($sql);
+  $stmt->execute(['soldto', $condition]);
+  $partners = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+if ($input !='' && !empty($input)){
+    $partner_available  = '<option value="'.$input.'" selected>'.$input.'</option><option value=" "> </option>';
+} else {
+    $partner_available  = '<option></option>';
+}
+
+$view ='
+    <input list="'.$type.'" name="'.$type.'" placeholder="'.$input.'" class="datalist">
+    <datalist id="'.$type.'">
+    '.$partner_available.'
+';
+
+foreach ($partners as $row) {
+$view .= '<option value="'.$row["partnerID"].'-'.$row["partnername"].'">'.$row["partnerID"].' - '.$row["partnername"].'</option>';
+}
+
+$view .= '</datalist>
+';
+return $view;
+}
+
+
 //------------------------------------------
 // UPLOAD PICTURE for PRODUCTS
 //------------------------------------------

contract.php

@@ -166,16 +166,19 @@ $view .=  '<div class="form responsive-width-100">
             </div>
             <div class="form responsive-width-100">
                 <label for="">'.$contract_reference.'</label>
-                <input type="number" name="reference" value="'.$contract['reference'].'" >
+                <input type="text" name="reference" value="'.$contract['reference'].'" >
             </div>
         </div>';
 
 
-//DISPLAY
+
+//GET PARTNER DROPDOWN
+$soldto_dropdown = listAccounts('accountID',$_SESSION['permission'],$contract['accountID']);
+
 $view .= '<div class="content-block tab-content">
             <div class="form responsive-width-100">
                 <label for="">'.$contract_account.'</label>
-                <input id="name" type="text" name="accountID" placeholder="'.$contract_account.'" value="'.$contract['accountID'].'" required>
+                '.$soldto_dropdown.'
             </div>
             <div class="form responsive-width-100">
                 <label for="">'.$contract_servicetool.'</label>
@@ -186,7 +189,7 @@ $view .= '<div class="content-block tab-content">
 
 
 //Check for assigned users
-$assigned_users = json_decode($contract['assigned_users']) ?? ''; 
+$assigned_users = (is_string($contract['assigned_users']))? json_decode($contract['assigned_users']) : ''; 
 
 if (is_array($assigned_users)) {                        
     foreach ($assigned_users as $user){