Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Revert "countries yml" #406

Merged
kavehmz merged 1 commit into from
Aug 24, 2015
Merged

Revert "countries yml" #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
253 changes: 252 additions & 1 deletion mojo/lib/BinaryStatic/Consts.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,255 @@ sub languages {
}
}

1;
sub countries {
return (
{ name => 'Afghanistan', code => 'af' },
{ name => 'Aland Islands', code => 'ax' },
{ name => 'Albania', code => 'al' },
{ name => 'Algeria', code => 'dz' },
{ name => 'American Samoa', code => 'as' },
{ name => 'Andorra', code => 'ad' },
{ name => 'Angola', code => 'ao' },
{ name => 'Anguilla', code => 'ai' },
{ name => 'Antarctica', code => 'aq' },
{ name => 'Antigua and Barbuda', code => 'ag' },
{ name => 'Argentina', code => 'ar' },
{ name => 'Armenia', code => 'am' },
{ name => 'Aruba', code => 'aw' },
{ name => 'Australia', code => 'au' },
{ name => 'Austria', code => 'at' },
{ name => 'Azerbaijan', code => 'az' },
{ name => 'Bahamas', code => 'bs', restricted => 1 },
{ name => 'Bahrain', code => 'bh' },
{ name => 'Bangladesh', code => 'bd' },
{ name => 'Barbados', code => 'bb' },
{ name => 'Belarus', code => 'by' },
{ name => 'Belgium', code => 'be' },
{ name => 'Belize', code => 'bz' },
{ name => 'Benin', code => 'bj' },
{ name => 'Bermuda', code => 'bm' },
{ name => 'Bhutan', code => 'bt' },
{ name => 'Bolivia', code => 'bo' },
{ name => 'Bosnia and Herzegovina', code => 'ba' },
{ name => 'Botswana', code => 'bw' },
{ name => 'Bouvet Island', code => 'bv' },
{ name => 'Brazil', code => 'br' },
{ name => 'British Indian Ocean Territory', code => 'io' },
{ name => 'Brunei Darussalam', code => 'bn' },
{ name => 'Bulgaria', code => 'bg' },
{ name => 'Burkina Faso', code => 'bf' },
{ name => 'Burundi', code => 'bi' },
{ name => 'Cambodia', code => 'kh' },
{ name => 'Cameroon', code => 'cm' },
{ name => 'Canada', code => 'ca' },
{ name => 'Cape Verde', code => 'cv' },
{ name => 'Cayman Islands', code => 'ky' },
{ name => 'Central African Republic', code => 'cf' },
{ name => 'Chad', code => 'td' },
{ name => 'Chile', code => 'cl' },
{ name => 'China', code => 'cn' },
{ name => 'Christmas Island', code => 'cx' },
{ name => 'Cocos (Keeling) Islands', code => 'cc' },
{ name => 'Colombia', code => 'co' },
{ name => 'Comoros', code => 'km' },
{ name => 'Congo', code => 'cg' },
{ name => 'Congo, The Democratic Republic of the', code => 'cd' },
{ name => 'Cook Islands', code => 'ck' },
{ name => 'Costa Rica', code => 'cr', restricted => 1 },
{ name => 'Cote D'Ivoire', code => 'ci' },
{ name => 'Croatia', code => 'hr' },
{ name => 'Cuba', code => 'cu' },
{ name => 'Cyprus', code => 'cy' },
{ name => 'Czech Republic', code => 'cz' },
{ name => 'Denmark', code => 'dk' },
{ name => 'Djibouti', code => 'dj' },
{ name => 'Dominica', code => 'dm' },
{ name => 'Dominican Republic', code => 'do' },
{ name => 'Ecuador', code => 'ec' },
{ name => 'Egypt', code => 'eg' },
{ name => 'El Salvador', code => 'sv' },
{ name => 'Equatorial Guinea', code => 'gq' },
{ name => 'Eritrea', code => 'er' },
{ name => 'Estonia', code => 'ee' },
{ name => 'Ethiopia', code => 'et' },
{ name => 'Falkland Islands (Malvinas)', code => 'fk' },
{ name => 'Faroe Islands', code => 'fo' },
{ name => 'Fiji', code => 'fj' },
{ name => 'Finland', code => 'fi' },
{ name => 'France', code => 'fr' },
{ name => 'French Guiana', code => 'gf' },
{ name => 'French Polynesia', code => 'pf' },
{ name => 'French Southern Territories', code => 'tf' },
{ name => 'Gabon', code => 'ga' },
{ name => 'Gambia', code => 'gm' },
{ name => 'Georgia', code => 'ge' },
{ name => 'Germany', code => 'de' },
{ name => 'Ghana', code => 'gh' },
{ name => 'Gibraltar', code => 'gi' },
{ name => 'Greece', code => 'gr' },
{ name => 'Greenland', code => 'gl' },
{ name => 'Grenada', code => 'gd' },
{ name => 'Guadeloupe', code => 'gp' },
{ name => 'Guam', code => 'gu' },
{ name => 'Guatemala', code => 'gt' },
{ name => 'Guernsey', code => 'gg', restricted => 1 },
{ name => 'Guinea', code => 'gn' },
{ name => 'Guinea-Bissau', code => 'gw' },
{ name => 'Guyana', code => 'gy' },
{ name => 'Haiti', code => 'ht' },
{ name => 'Heard Island and McDonald Islands', code => 'hm' },
{ name => 'Holy See (Vatican City State)', code => 'va' },
{ name => 'Honduras', code => 'hn' },
{ name => 'Hong Kong', code => 'hk', restricted => 1 },
{ name => 'Hungary', code => 'hu' },
{ name => 'Iceland', code => 'is' },
{ name => 'India', code => 'in' },
{ name => 'Indonesia', code => 'id' },
{ name => 'Iran, Islamic Republic of', code => 'ir', restricted => 1 },
{ name => 'Iraq', code => 'iq' },
{ name => 'Ireland', code => 'ie' },
{ name => 'Isle of Man', code => 'im' },
{ name => 'Israel', code => 'il' },
{ name => 'Italy', code => 'it' },
{ name => 'Jamaica', code => 'jm' },
{ name => 'Japan', code => 'jp', restricted => 1 },
{ name => 'Jersey', code => 'je', restricted => 1 },
{ name => 'Jordan', code => 'jo' },
{ name => 'Kazakhstan', code => 'kz' },
{ name => 'Kenya', code => 'ke' },
{ name => 'Kiribati', code => 'ki' },
{ name => 'Korea, Democratic People's Republic of', code => 'kp' },
{ name => 'Korea, Republic of', code => 'kr' },
{ name => 'Kuwait', code => 'kw' },
{ name => 'Kyrgyzstan', code => 'kg' },
{ name => 'Lao People's Democratic Republic', code => 'la' },
{ name => 'Latvia', code => 'lv' },
{ name => 'Lebanon', code => 'lb' },
{ name => 'Lesotho', code => 'ls' },
{ name => 'Liberia', code => 'lr' },
{ name => 'Libyan Arab Jamahiriya', code => 'ly' },
{ name => 'Liechtenstein', code => 'li' },
{ name => 'Lithuania', code => 'lt' },
{ name => 'Luxembourg', code => 'lu' },
{ name => 'Macao', code => 'mo' },
{ name => 'Macedonia', code => 'mk' },
{ name => 'Madagascar', code => 'mg' },
{ name => 'Malawi', code => 'mw' },
{ name => 'Malaysia', code => 'my', restricted => 1 },
{ name => 'Maldives', code => 'mv' },
{ name => 'Mali', code => 'ml' },
{ name => 'Malta', code => 'mt', restricted => 1 },
{ name => 'Marshall Islands', code => 'mh' },
{ name => 'Martinique', code => 'mq' },
{ name => 'Mauritania', code => 'mr' },
{ name => 'Mauritius', code => 'mu' },
{ name => 'Mayotte', code => 'yt' },
{ name => 'Mexico', code => 'mx' },
{ name => 'Micronesia, Federated States of', code => 'fm' },
{ name => 'Moldova, Republic of', code => 'md' },
{ name => 'Monaco', code => 'mc' },
{ name => 'Mongolia', code => 'mn' },
{ name => 'Montenegro', code => 'me' },
{ name => 'Montserrat', code => 'ms' },
{ name => 'Morocco', code => 'ma' },
{ name => 'Mozambique', code => 'mz' },
{ name => 'Myanmar', code => 'mm' },
{ name => 'Namibia', code => 'na' },
{ name => 'Nauru', code => 'nr' },
{ name => 'Nepal', code => 'np' },
{ name => 'Netherlands', code => 'nl' },
{ name => 'Netherlands Antilles', code => 'an' },
{ name => 'New Caledonia', code => 'nc' },
{ name => 'New Zealand', code => 'nz' },
{ name => 'Nicaragua', code => 'ni' },
{ name => 'Niger', code => 'ne' },
{ name => 'Nigeria', code => 'ng' },
{ name => 'Niue', code => 'nu' },
{ name => 'Norfolk Island', code => 'nf' },
{ name => 'Northern Mariana Islands', code => 'mp' },
{ name => 'Norway', code => 'no' },
{ name => 'Oman', code => 'om' },
{ name => 'Pakistan', code => 'pk' },
{ name => 'Palau', code => 'pw' },
{ name => 'Palestinian Territory, Occupied', code => 'ps' },
{ name => 'Panama', code => 'pa' },
{ name => 'Papua New Guinea', code => 'pg' },
{ name => 'Paraguay', code => 'py' },
{ name => 'Peru', code => 'pe' },
{ name => 'Philippines', code => 'ph' },
{ name => 'Pitcairn', code => 'pn' },
{ name => 'Poland', code => 'pl' },
{ name => 'Portugal', code => 'pt' },
{ name => 'Puerto Rico', code => 'pr' },
{ name => 'Qatar', code => 'qa' },
{ name => 'Reunion', code => 're' },
{ name => 'Romania', code => 'ro' },
{ name => 'Russian Federation', code => 'ru' },
{ name => 'Rwanda', code => 'rw' },
{ name => 'Saint Helena', code => 'sh' },
{ name => 'Saint Kitts and Nevis', code => 'kn' },
{ name => 'Saint Lucia', code => 'lc' },
{ name => 'Saint Pierre and Miquelon', code => 'pm' },
{ name => 'Saint Vincent and the Grenadines', code => 'vc' },
{ name => 'Saint-Barthélemy', code => 'bl' },
{ name => 'Saint-Martin (French part)', code => 'mf' },
{ name => 'Samoa', code => 'ws' },
{ name => 'San Marino', code => 'sm' },
{ name => 'Sao Tome and Principe', code => 'st' },
{ name => 'Saudi Arabia', code => 'sa' },
{ name => 'Senegal', code => 'sn' },
{ name => 'Serbia', code => 'rs' },
{ name => 'Seychelles', code => 'sc' },
{ name => 'Sierra Leone', code => 'sl' },
{ name => 'Singapore', code => 'sg' },
{ name => 'Slovakia', code => 'sk' },
{ name => 'Slovenia', code => 'si' },
{ name => 'Solomon Islands', code => 'sb' },
{ name => 'Somalia', code => 'so' },
{ name => 'South Africa', code => 'za' },
{ name => 'South Georgia and the South Sandwich Islands', code => 'gs' },
{ name => 'Spain', code => 'es' },
{ name => 'Sri Lanka', code => 'lk' },
{ name => 'Sudan', code => 'sd' },
{ name => 'Suriname', code => 'sr' },
{ name => 'Svalbard and Jan Mayen', code => 'sj' },
{ name => 'Swaziland', code => 'sz' },
{ name => 'Sweden', code => 'se' },
{ name => 'Switzerland', code => 'ch' },
{ name => 'Syrian Arab Republic', code => 'sy' },
{ name => 'Taiwan, Province of China', code => 'tw' },
{ name => 'Tajikistan', code => 'tj' },
{ name => 'Tanzania, United Republic of', code => 'tz' },
{ name => 'Thailand', code => 'th' },
{ name => 'Timor-Leste', code => 'tl' },
{ name => 'Togo', code => 'tg' },
{ name => 'Tokelau', code => 'tk' },
{ name => 'Tonga', code => 'to' },
{ name => 'Trinidad and Tobago', code => 'tt' },
{ name => 'Tunisia', code => 'tn' },
{ name => 'Turkey', code => 'tr' },
{ name => 'Turkmenistan', code => 'tm' },
{ name => 'Turks and Caicos Islands', code => 'tc' },
{ name => 'Tuvalu', code => 'tv' },
{ name => 'Uganda', code => 'ug' },
{ name => 'Ukraine', code => 'ua' },
{ name => 'United Arab Emirates', code => 'ae' },
{ name => 'United Kingdom', code => 'gb' },
{ name => 'United States', code => 'us', restricted => 1 },
{ name => 'United States Minor Outlying Islands', code => 'um', restricted => 1 },
{ name => 'Uruguay', code => 'uy' },
{ name => 'Uzbekistan', code => 'uz' },
{ name => 'Vanuatu', code => 'vu' },
{ name => 'Venezuela', code => 've' },
{ name => 'Vietnam', code => 'vn' },
{ name => 'Virgin Islands, British', code => 'vg' },
{ name => 'Virgin Islands, U.S.', code => 'vi', restricted => 1 },
{ name => 'Wallis and Futuna', code => 'wf' },
{ name => 'Western Sahara', code => 'eh' },
{ name => 'Yemen', code => 'ye' },
{ name => 'Zambia', code => 'zm' },
{ name => 'Zimbabwe', code => 'zw' }
);
}

1;
6 changes: 6 additions & 0 deletions mojo/lib/BinaryStatic/Helpers.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ sub register {
calendar_icon => $c->url_for('/images/common/calendar_icon_1.png')->to_string,
},
broker => 'CR',
restricted_countries => 'cr|hk|ir|my|mt|us|vi|um|jp|bs|je|gg',
valid_loginids => "MX|VRTC|MLT|CR|FOG|BFT|VRTM|VRTU|WS'",
streaming_server => 'stream.binary.com',
arr_all_currencies => ["USD","EUR","GBP","AUD"],
Expand Down Expand Up @@ -151,6 +152,11 @@ sub register {
return (shift)->l(@_);
});

$app->helper(
countries_options => sub {
return BinaryStatic::Consts::countries();
});

$app->helper(
get_current_path => sub {
my $c = shift;
Expand Down
20 changes: 3 additions & 17 deletions src/javascript/binary/base/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ var User = function() {

var Client = function() {
this.loginid = $.cookie('loginid');
this.residence = $.cookie('residence');
this.is_logged_in = false;
this.is_real = false;
if(this.loginid === null || typeof this.loginid === "undefined") {
Expand Down Expand Up @@ -649,12 +648,12 @@ Contents.prototype = {
$('#topbar').addClass('dark-blue');
$('#topbar').removeClass('orange');

if (!/^CR/.test(this.client.loginid)) {
if (!/^Q?CR/.test(this.client.loginid)) {
$('#payment-agent-section').addClass('invisible');
$('#payment-agent-section').hide();
}

if (!/^MF|MLT/.test(this.client.loginid)) {
if (!/^Q?MF|MLT/.test(this.client.loginid)) {
$('#account-transfer-section').addClass('invisible');
$('#account-transfer-section').hide();
}
Expand Down Expand Up @@ -695,30 +694,17 @@ Contents.prototype = {
topbar_message_visibility: function() {
if(this.client.is_logged_in) {
var loginid_array = this.user.loginid_array;
var c_config = page.settings.get('countries_list')[this.client.residence];

if (!this.client.is_real) {
var show_upgrade = true;
for (var i=0;i<loginid_array.length;i++) {
if (loginid_array[i].real) {
$('#virtual-upgrade-link').addClass('invisible');
$('#vr-financial-upgrade-link').addClass('invisible');
show_upgrade = false;
break;
}
}
if (show_upgrade) {
if (c_config && c_config['gaming_company'] == 'none' && c_config['financial_company'] == 'maltainvest') {
$('#virtual-upgrade-link').addClass('invisible');
$('#vr-financial-upgrade-link').removeClass('invisible');
} else {
$('#virtual-upgrade-link').removeClass('invisible');
$('#vr-financial-upgrade-link').addClass('invisible');
}
}
} else {
var show_financial = false;
if (c_config && c_config['financial_company'] == 'maltainvest') {
if (/MLT/.test(this.client.loginid)) {
show_financial = true;
for (var j=0;j<loginid_array.length;j++) {
if (loginid_array[j].financial) {
Expand Down
Loading