diff --git a/clients.php b/clients.php index e16d6a23..654e0c81 100644 --- a/clients.php +++ b/clients.php @@ -12,22 +12,22 @@ $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, ' $sql = mysqli_query( $mysqli, " -SELECT SQL_CALC_FOUND_ROWS clients.*, contacts.*, locations.*, GROUP_CONCAT(tags.tag_name) AS tag_names -FROM clients -LEFT JOIN contacts ON clients.primary_contact = contacts.contact_id AND contacts.contact_archived_at IS NULL -LEFT JOIN locations ON clients.primary_location = locations.location_id AND locations.location_archived_at IS NULL -LEFT JOIN client_tags ON client_tags.client_tag_client_id = clients.client_id -LEFT JOIN tags ON tags.tag_id = client_tags.client_tag_tag_id -WHERE (clients.client_name LIKE '%$q%' OR clients.client_type LIKE '%$q%' OR clients.client_referral LIKE '%$q%' - OR contacts.contact_email LIKE '%$q%' OR contacts.contact_name LIKE '%$q%' OR contacts.contact_phone LIKE '%$phone_query%' - OR contacts.contact_mobile LIKE '%$phone_query%' OR locations.location_address LIKE '%$q%' - OR locations.location_city LIKE '%$q%' OR locations.location_state LIKE '%$q%' OR locations.location_zip LIKE '%$q%' - OR tags.tag_name LIKE '%$q%' OR clients.client_tax_id_number LIKE '%$q%') - AND clients.client_archived_at IS NULL - AND DATE(clients.client_created_at) BETWEEN '$dtf' AND '$dtt' -GROUP BY clients.client_id -ORDER BY $sb $o -LIMIT $record_from, $record_to + SELECT SQL_CALC_FOUND_ROWS clients.*, contacts.*, locations.*, GROUP_CONCAT(tags.tag_name) AS tag_names + FROM clients + LEFT JOIN contacts ON clients.primary_contact = contacts.contact_id AND contacts.contact_archived_at IS NULL + LEFT JOIN locations ON clients.primary_location = locations.location_id AND locations.location_archived_at IS NULL + LEFT JOIN client_tags ON client_tags.client_tag_client_id = clients.client_id + LEFT JOIN tags ON tags.tag_id = client_tags.client_tag_tag_id + WHERE (clients.client_name LIKE '%$q%' OR clients.client_type LIKE '%$q%' OR clients.client_referral LIKE '%$q%' + OR contacts.contact_email LIKE '%$q%' OR contacts.contact_name LIKE '%$q%' OR contacts.contact_phone LIKE '%$phone_query%' + OR contacts.contact_mobile LIKE '%$phone_query%' OR locations.location_address LIKE '%$q%' + OR locations.location_city LIKE '%$q%' OR locations.location_state LIKE '%$q%' OR locations.location_zip LIKE '%$q%' + OR tags.tag_name LIKE '%$q%' OR clients.client_tax_id_number LIKE '%$q%') + AND clients.client_archived_at IS NULL + AND DATE(clients.client_created_at) BETWEEN '$dtf' AND '$dtt' + GROUP BY clients.client_id + ORDER BY $sb $o + LIMIT $record_from, $record_to "); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); diff --git a/transfer_add_modal.php b/transfer_add_modal.php index 3dac2ab2..ee40208f 100644 --- a/transfer_add_modal.php +++ b/transfer_add_modal.php @@ -111,7 +111,36 @@
- + +
+ +
+
+ +
+ +
+
@@ -124,3 +153,13 @@ + +