From f57958097e199de7b3accf36d2ac149ca1e8113b Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Wed, 27 May 2020 19:41:55 +0530
Subject: [PATCH] Google Map fields ported to DB
---
.../Google/modules/Google/helpers/Map.php | 83 +++++++++++++------
1 file changed, 59 insertions(+), 24 deletions(-)
diff --git a/pkg/vtiger/modules/Google/modules/Google/helpers/Map.php b/pkg/vtiger/modules/Google/modules/Google/helpers/Map.php
index 5f44821af..92a3b575b 100644
--- a/pkg/vtiger/modules/Google/modules/Google/helpers/Map.php
+++ b/pkg/vtiger/modules/Google/modules/Google/helpers/Map.php
@@ -11,6 +11,38 @@
class Google_Map_Helper {
+ public function __construct() {
+ self::initializeSchema();
+ }
+
+ /**
+ * Creates table if not exists
+ */
+ private static function initializeSchema() {
+ if (!Vtiger_Utils::CheckTable('vtiger_google_map')) {
+ // create table
+ Vtiger_Utils::CreateTable('vtiger_google_map', '(module varchar(255), parameter_name varchar(255), parameter_field varchar(255))', true);
+ // fill with defaults
+ $db = PearDatabase::getInstance();
+ $db->pquery("INSERT INTO `vtiger_google_map` (`module`, `parameter_name`, `parameter_field`) VALUES
+ ('Contacts', 'street', 'mailingstreet'),
+ ('Contacts', 'city', 'mailingcity'),
+ ('Contacts', 'state','mailingstate'),
+ ('Contacts', 'zip', 'mailingzip'),
+ ('Contacts', 'country', 'mailingcountry'),
+ ('Leads', 'street', 'lane'),
+ ('Leads', 'city', 'city'),
+ ('Leads', 'state', 'state'),
+ ('Leads', 'zip', 'code'),
+ ('Leads', 'country', 'country'),
+ ('Accounts', 'street', 'bill_street'),
+ ('Accounts', 'city', 'bill_city'),
+ ('Accounts', 'state', 'bill_state'),
+ ('Accounts', 'zip', 'bill_code'),
+ ('Accounts', 'country', 'bill_country');");
+ }
+ }
+
/**
* get the location for the record based on the module type
* @param type $request
@@ -40,30 +72,33 @@ class Google_Map_Helper {
* @param type $module
* @return type
*/
- static function getLocationFields($module) {
- $locationFields = array();
- switch ($module) {
- case 'Contacts' : $locationFields = array('street' => 'mailingstreet',
- 'city' => 'mailingcity',
- 'state' => 'mailingstate',
- 'zip' => 'mailingzip',
- 'country' => 'mailingcountry');
- break;
- case 'Leads' : $locationFields = array('street' => 'lane',
- 'city' => 'city',
- 'state' => 'state',
- 'zip' => 'code',
- 'country' => 'country');
- break;
- case 'Accounts' : $locationFields = array('street' => 'bill_street',
- 'city' => 'bill_city',
- 'state' => 'bill_state',
- 'zip' => 'bill_code',
- 'country' => 'bill_country');
- break;
- }
- return $locationFields;
- }
+ static function getLocationFields($module) {
+ self::initializeSchema();
+ $db = PearDatabase::getInstance();
+ $result = $db->pquery("SELECT * FROM vtiger_google_map WHERE module='$module'");
+ $number = $db->num_rows($result);
+ $retArray = array();
+ if ($number >= 1){
+ // fill return array with db values
+ for($i=0;$i<$number;$i++) {
+ $row = $db->fetch_row($result);
+ $retArray[$row['parameter_name']] = $row['parameter_field'];
+ }
+ } else {
+ // in case nothing came from db
+ switch ($module) {
+ case 'Contacts': $retArray = array('street' => 'mailingstreet', 'city' => 'mailingcity', 'state' => 'mailingstate','zip' => 'mailingzip','country' => 'mailingcountry');
+ break;
+ case 'Leads' : $retArray = array('street' => 'lane', 'city' => 'city', 'state' => 'state', 'zip' => 'code', 'country' => 'country');
+ break;
+ case 'Accounts' : $retArray = array('street' => 'bill_street', 'city' => 'bill_city', 'state' => 'bill_state', 'zip' => 'bill_code','country' => 'bill_country');
+ break;
+ default : $retArray = array();
+ break;
+ }
+ }
+ return $retArray;
+ }
}
--
GitLab