Changeset 2774
- Timestamp:
- 03/08/10 12:27:04 (2 years ago)
- Files:
-
- trunk/common/lib/customer.defines.php (modified) (1 diff)
- trunk/customer/form_data/FG_var_signup.inc (modified) (19 diffs)
- trunk/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.2-to-v1.7.0.sql (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/common/lib/customer.defines.php
r2759 r2774 89 89 //Enable Disable Captcha 90 90 define ("CAPTCHA_ENABLE", isset($A2B->config["signup"]['enable_captcha'])?$A2B->config["signup"]['enable_captcha']:0); 91 92 //Enable Disable 93 define ("LANGUAGE_ENABLE", isset($A2B->config["signup"]['field_language'])?$A2B->config["signup"]['field_language']:0); 94 define ("CURRENCY_ENABLE", isset($A2B->config["signup"]['field_currency'])?$A2B->config["signup"]['field_currency']:0); 95 define ("LASTNAME_ENABLE", isset($A2B->config["signup"]['field_lastname'])?$A2B->config["signup"]['field_lastname']:0); 96 define ("FIRSTNAME_ENABLE", isset($A2B->config["signup"]['field_firstname'])?$A2B->config["signup"]['field_firstname']:0); 97 define ("ADDRESS_ENABLE", isset($A2B->config["signup"]['field_address'])?$A2B->config["signup"]['field_address']:0); 98 define ("CITY_ENABLE", isset($A2B->config["signup"]['field_city'])?$A2B->config["signup"]['field_city']:0); 99 define ("STATE_ENABLE", isset($A2B->config["signup"]['field_state'])?$A2B->config["signup"]['field_state']:0); 100 define ("COUNTRY_ENABLE", isset($A2B->config["signup"]['field_country'])?$A2B->config["signup"]['field_country']:0); 101 define ("ZIPCODE_ENABLE", isset($A2B->config["signup"]['field_zipcode'])?$A2B->config["signup"]['field_zipcode']:0); 102 define ("TIMEZONE_ENABLE", isset($A2B->config["signup"]['field_id_timezone'])?$A2B->config["signup"]['field_id_timezone']:0); 103 define ("PHONE_ENABLE", isset($A2B->config["signup"]['field_phone'])?$A2B->config["signup"]['field_phone']:0); 104 define ("FAX_ENABLE", isset($A2B->config["signup"]['field_fax'])?$A2B->config["signup"]['field_fax']:0); 105 define ("COMP_ENABLE", isset($A2B->config["signup"]['field_company'])?$A2B->config["signup"]['field_company']:0); 106 define ("COMP_WEB_ENABLE", isset($A2B->config["signup"]['field_company_website'])?$A2B->config["signup"]['field_company_website']:0); 107 define ("VAT_RN_ENABLE", isset($A2B->config["signup"]['field_VAT_RN'])?$A2B->config["signup"]['field_VAT_RN']:0); 108 define ("TRAFFIC_ENABLE", isset($A2B->config["signup"]['field_traffic'])?$A2B->config["signup"]['field_traffic']:0); 109 define ("TRAFFIC_TARGET_ENABLE", isset($A2B->config["signup"]['field_traffic_target'])?$A2B->config["signup"]['field_traffic_target']:0); 110 91 111 // For ePayment Modules 92 112 define('PULL_DOWN_DEFAULT', 'Please Select'); trunk/customer/form_data/FG_var_signup.inc
r2731 r2774 152 152 153 153 $language_list = Constants::getLanguagesList(); 154 154 if (LANGUAGE_ENABLE) { 155 155 $HD_Form->AddEditElement(gettext("LANGUAGE"), "language", "", "SELECT", "", "", "", "list", "", "", "", $language_list, "%1", "", ""); 156 156 $language_editFG = "language,"; 157 } 158 if (CURRENCY_ENABLE) { 157 159 $HD_Form->AddEditElement("CURRENCY", "currency", "", "SELECT", "", "", "", "list", "", "", "", $currency_list, "%1", "", ""); 158 160 $currency_editFG = "currency,"; 161 } 159 162 if (!$agent_conf && strpos($callPlan_idlist, ',') !== false && !($subscriber_signup>0)) { 160 163 $HD_Form->AddEditElement(gettext("CALL PLAN"), "tariff", "", "SELECT", "", "", "", "list", "", "", "", $callPlan_list, "%1", "", ""); … … 169 172 $comp_zero = "value='0'"; 170 173 } 171 174 if (LASTNAME_ENABLE) { 172 175 $HD_Form->AddEditElement(gettext("LASTNAME"), 173 176 "lastname", … … 176 179 "size=30 maxlength=50", "11", 177 180 gettext("Insert your lastname"), "", "", "", "", "", "", "", ""); 178 181 $lastname_editFG = "lastname,"; 182 } 183 if (FIRSTNAME_ENABLE) { 179 184 $HD_Form->AddEditElement(gettext("FIRSTNAME"), 180 185 "firstname", … … 183 188 "size=30 maxlength=50", "11", 184 189 gettext("Insert your firstname"), "", "", "", "", "", "", "", ""); 185 190 $firstname_editFG = "firstname,"; 191 } 186 192 $HD_Form->AddEditElement(gettext("EMAIL"), 187 193 "email", … … 190 196 "size=30 maxlength=70", "1", 191 197 gettext("Insert your email"), "", "", "", "", "", "", "", ""); 192 198 if (ADDRESS_ENABLE) { 193 199 $HD_Form->AddEditElement(gettext("ADDRESS"), 194 200 "address", … … 197 203 "size=30 maxlength=100", "0", 198 204 gettext("Insert your address"), "", "", "", "", "", "", "", ""); 199 205 $address_editFG = "address,"; 206 } 207 if (CITY_ENABLE) { 200 208 $HD_Form->AddEditElement(gettext("CITY"), 201 209 "city", … … 204 212 "size=30 maxlength=40", "0", 205 213 gettext("Insert your city"), "", "", "", "", "", "", "", ""); 206 214 $city_editFG = "city,"; 215 } 216 if (STATE_ENABLE) { 207 217 $HD_Form->AddEditElement(gettext("STATE/PROVINCE"), 208 218 "state", … … 211 221 "size=30 maxlength=40", "11", 212 222 gettext("Insert your state"), "", "", "", "", "", "", "NO", ""); 213 223 $state_editFG = "state,"; 224 } 214 225 if ($form_action == 'ask-add') { 215 226 $country_default_val = 'USA'; 216 227 } 217 228 if (COUNTRY_ENABLE) { 218 229 $HD_Form->AddEditElement(gettext("COUNTRY"), 219 230 "country", … … 223 234 "cc_country", "countryname, countrycode", 224 235 "", "", "%1", "", "", "", ''); 225 236 $country_editFG = "country,"; 237 } 238 if (ZIPCODE_ENABLE) { 226 239 $HD_Form->AddEditElement(gettext("ZIP/POSTAL CODE"), "zipcode", '$value', "INPUT", "size=30 maxlength=20", "0", gettext("Insert your zipcode"), "", "", "", "", "", "", "", ""); 227 240 $zipcode_editFG = "zipcode,"; 241 } 228 242 $timezone_list = get_timezones(); 229 243 $one_select = false; … … 240 254 } 241 255 } 242 256 if (TIMEZONE_ENABLE) { 243 257 $HD_Form->AddEditElement(gettext("TIMEZONE"), 244 258 "id_timezone", … … 249 263 $timezone_list, 250 264 "%1", "", ""); 251 265 $id_timezone_editFG = "id_timezone,"; 266 } 267 if (PHONE_ENABLE) { 252 268 $HD_Form->AddEditElement(gettext("PHONENUMBER"), 253 269 "phone", … … 255 271 "INPUT", "size=30 maxlength=20", 256 272 "7", gettext("Insert your phone number"), "", "", "", "", "", "", "", ""); 257 273 $phone_editFG = "phone,"; 274 } 275 if (FAX_ENABLE) { 258 276 $HD_Form->AddEditElement(gettext("FAXNUMBER"), 259 277 "fax", … … 261 279 "INPUT", "size=30 maxlength=20", 262 280 "", gettext("Insert your fax number"), "", "", "", "", "", "", "", ""); 263 281 $fax_editFG = "fax,"; 282 } 283 if (COMP_ENABLE) { 264 284 $HD_Form->AddEditElement(gettext("COMPANY NAME"), 265 285 "company_name", … … 267 287 "INPUT", "size=40 maxlength=50", 268 288 "", gettext("Insert Company name of this customer"), "", "", "", "", "", "", "NO", ""); 269 289 $company_name_editFG = "company_name,"; 290 } 291 if (COMP_WEB_ENABLE) { 270 292 $HD_Form->AddEditElement(gettext("COMPANY WEBSITE"), 271 293 "company_website", … … 273 295 "INPUT", "size=40 maxlength=60", 274 296 "", gettext("Insert the company website of this customer"), "", "", "", "", "", "", "NO", ""); 275 297 $company_website_editFG = "company_website,"; 298 } 299 if (VAT_RN_ENABLE) { 276 300 $HD_Form->AddEditElement(gettext("VAT REGISTRATION NUMBER "), 277 301 "VAT_RN", … … 279 303 "INPUT", "size=40 maxlength=40", 280 304 "", gettext("Insert the VAT registration number of this customer"), "", "", "", "", "", "", "NO", ""); 281 305 $VAT_RN_editFG = "VAT_RN,"; 306 } 307 if (TRAFFIC_ENABLE) { 282 308 $HD_Form->AddEditElement(gettext("TRAFFIC PER MONTH"), 283 309 "traffic", … … 285 311 "INPUT", "size=30 maxlength=20", 286 312 "4", gettext("Insert the traffic per month for this customer"), "", "", "", "", "", "", "NO", ""); 287 313 $traffic_editFG = "traffic,"; 314 } 315 if (TRAFFIC_TARGET_ENABLE) { 288 316 $HD_Form->AddEditElement(gettext("TARGET TRAFFIC"), 289 317 "traffic_target", … … 291 319 "TEXTAREA", "cols=50 rows=4", 292 320 "", gettext("Insert the target traffic description"), "", "", "", "", "", "", "", ""); 293 294 321 $traffic_target_editFG = "traffic_target,"; 322 } 295 323 if (CAPTCHA_ENABLE) { 296 324 $HD_Form->AddEditElement(gettext("VERIFICATION"), "captchacode", '$value', "CAPTCHAIMAGE", "size=10 maxlength=6", "19", gettext("Insert code from above picture"), "", "", "", "", "", "", "", "", CAPTCHA_ENABLE); … … 299 327 300 328 if (!$agent_conf && strpos($callPlan_idlist, ',') !== false && !($subscriber_signup>0)) { 301 $HD_Form->FieldEditElement('username, useralias, uipass, credit, language, tariff, id_didgroup, id_campaign,' . 302 'callback, activated, simultaccess, currency, runservice, typepaid, creditlimit, firstusedate, enableexpire,' . 303 'expirationdate, expiredays, vat, lastname, firstname, email, address, city, state, country, zipcode, id_timezone, phone,' . 304 'fax, company_name , company_website ,VAT_RN , traffic, traffic_target , ' . $captcha . ' sip_buddy, iax_buddy, inuse'); 329 $HD_Form->FieldEditElement('username, useralias, uipass, credit, ' . $language_editFG . ' tariff, id_didgroup, id_campaign,' . 330 'callback, activated, simultaccess, ' . $currency_editFG . ' runservice, typepaid, creditlimit, firstusedate, enableexpire,' . 331 'expirationdate, expiredays, vat, ' . $lastname_editFG . $firstname_editFG . ' email,' . $address_editFG . $city_editFG . $state_editFG . $country_editFG . $zipcode_editFG . $id_timezone_editFG . $phone_editFG . $fax_editFG . $company_name_editFG . $company_website_editFG . $VAT_RN_editFG . $traffic_editFG . $traffic_target_editFG . $captcha . ' sip_buddy, iax_buddy, inuse'); 305 332 } else { 306 $HD_Form->FieldEditElement('username, useralias, uipass, credit, language, id_didgroup, id_campaign,' . 307 'callback, activated, simultaccess, currency, runservice, typepaid, creditlimit, firstusedate, enableexpire,' . 308 'expirationdate, expiredays, vat, lastname, firstname, email, address, city, state, country, zipcode, id_timezone, phone,' . 309 'fax , company_name , company_website ,VAT_RN , traffic, traffic_target , ' . $captcha . ' sip_buddy, iax_buddy, inuse'); 333 $HD_Form->FieldEditElement('username, useralias, uipass, credit, ' . $language_editFG . ' id_didgroup, id_campaign,' . 334 'callback, activated, simultaccess, ' . $currency_editFG . ' runservice, typepaid, creditlimit, firstusedate, enableexpire,' . 335 'expirationdate, expiredays, vat, ' . $lastname_editFG . $firstname_editFG . ' email,' . $address_editFG . $city_editFG . $state_editFG . $country_editFG . $zipcode_editFG . $id_timezone_editFG . $phone_editFG . $fax_editFG . $company_name_editFG . $company_website_editFG . $VAT_RN_editFG . $traffic_editFG . $traffic_target_editFG . $captcha . ' sip_buddy, iax_buddy, inuse'); 310 336 } 311 337 trunk/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.2-to-v1.7.0.sql
r2773 r2774 32 32 33 33 34 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Language field', 'field_language', '1', 'Enable The Language Field - Yes 1 - No 0.', '1', 'yes,no', 'signup'); 35 36 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Currency field', 'field_currency', '1', 'Enable The Currency Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 37 38 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Last Name Field', 'field_lastname', '1', 'Enable The Last Name Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 39 40 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'First Name Field', 'field_firstname', '1', 'Enable The First Name Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 41 42 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Address Field', 'field_address', '1', 'Enable The Address Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 43 44 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'City Field', 'field_city', '1', 'Enable The City Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 45 46 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'State Field', 'field_state', '1', 'Enable The State Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 47 48 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Country Field', 'field_country', '1', 'Enable The Country Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 49 50 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Zipcode Field', 'field_zipcode', '1', 'Enable The Zipcode Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 51 52 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Timezone Field', 'field_id_timezone', '1', 'Enable The Timezone Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 53 54 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Phone Field', 'field_phone', '1', 'Enable The Phone Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 55 56 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Fax Field', 'field_fax', '1', 'Enable The Fax Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 57 58 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Company Name Field', 'field_company', '1', 'Enable The Company Name Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 59 60 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Company Website Field', 'field_company_website', '1', 'Enable The Company Website Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 61 62 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'VAT Registration Number Field', 'field_VAT_RN', '1', 'Enable The VAT Registration Number Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 63 64 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Traffic Field', 'field_traffic', '1', 'Enable The Traffic Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 65 66 INSERT INTO cc_config (id, config_title, config_key, config_value, config_description, config_valuetype, config_listvalues, config_group_title) VALUES (NULL, 'Traffic Target Field', 'field_traffic_target', '1', 'Enable The Traffic Target Field - Yes 1 - No 0. ', '1', 'yes,no', 'signup'); 67 68 69 70 34 71 UPDATE cc_version SET version = '1.7.0'; 35 72
