ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor bug fixes 

Updated global JS
Added feedback/bug fix button
This commit is contained in:
Dave 2016-04-13 15:44:07 +01:00 committed by Dave Earley
parent 3ef62fd8a2
commit a5a94790e7
17 changed files with 410 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Attendize/Utils.php
View File

@ -4,6 +4,7 @@ namespace App\Attendize;
class Utils
{
public static function isRegistered()
{
return Auth::check() && Auth::user()->is_registered;

60
app/Helpers/helpers.php
View File

@ -1,33 +1,37 @@
<?php
/**
* @param int $amount
* @param string $currency_code
* @param int $decimals
* @param string $dec_point
* @param string $thousands_sep
*
* @return string
*/
function money($amount, $currency_code = '', $decimals = 2, $dec_point = '.', $thousands_sep = ',')
{
switch ($currency_code) {
case 'USD':
case 'AUD':
case 'CAD':
$currency_symbol = '$';
break;
case 'EUR':
$currency_symbol = '€';
break;
case 'GBP':
$currency_symbol = '£';
break;
if(!function_exists('money')) {
/**
* @param int $amount
* @param string $currency_code
* @param int $decimals
* @param string $dec_point
* @param string $thousands_sep
*
* @return string
*/
function money($amount, $currency_code = '', $decimals = 2, $dec_point = '.', $thousands_sep = ',')
{
switch ($currency_code) {
case 'USD':
case 'AUD':
case 'CAD':
$currency_symbol = '$';
break;
case 'EUR':
$currency_symbol = '€';
break;
case 'GBP':
$currency_symbol = '£';
break;
default:
$currency_symbol = '';
break;
default:
$currency_symbol = '';
break;
}
return $currency_symbol . number_format($amount, $decimals, $dec_point, $thousands_sep);
}
return $currency_symbol.number_format($amount, $decimals, $dec_point, $thousands_sep);
}

3
app/Http/Controllers/MyBaseController.php
View File

@ -24,6 +24,9 @@ class MyBaseController extends Controller
'email' => Auth::user()->email,
'is_confirmed' => Auth::user()->is_confirmed,
],
/*
* @todo These should be user selectable
*/
'DateFormat' =>'dd-MM-yyyy',
'DateTimeFormat' => 'dd-MM-yyyy hh:mm',
'GenericErrorMessage' => 'Whoops!, An unknown error has occurred. Please try again or contact support if the problem persists.'

2
app/Providers/AppServiceProvider.php
View File

@ -13,7 +13,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
require app_path('Attendize/constants.php');
//require app_path('Attendize/constants.php');
}
/**

2
config/attendize.php
View File

@ -2,6 +2,8 @@
return [
'version' => file_get_contents(base_path('VERSION')),
'ticket_status_sold_out' => 1,
'ticket_status_after_sale_date' => 2,//
'enable_test_payments' => env('ENABLE_TEST_PAYMENTS', false),

475
database/seeds/ConstantsSeeder.php
View File

@ -8,19 +8,19 @@ class ConstantsSeeder extends Seeder
{
$order_statuses = [
[
'id' => 1,
'id' => 1,
'name' => 'Completed',
],
[
'id' => 2,
'id' => 2,
'name' => 'Refunded',
],
[
'id' => 3,
'id' => 3,
'name' => 'Partially Refunded',
],
[
'id' => 4,
'id' => 4,
'name' => 'Cancelled',
],
];
@ -29,133 +29,99 @@ class ConstantsSeeder extends Seeder
$ticket_statuses = [
[
'id' => 1,
'id' => 1,
'name' => 'Sold Out',
],
[
'id' => 2,
'id' => 2,
'name' => 'Sales Have Ended',
],
[
'id' => 3,
'id' => 3,
'name' => 'Not On Sale Yet',
],
[
'id' => 4,
'id' => 4,
'name' => 'On Sale',
],
[
'id' => 5,
'id' => 5,
'name' => 'On Sale',
],
];
DB::table('ticket_statuses')->insert($ticket_statuses);
/*
* Question Types
*/
$question_types = [
[
'id' => 0,
'name' => 'Single-line text box',
'allow_multiple' => 0,
],
[
'id' => 1,
'name' => 'Multi-line text box',
'allow_multiple' => 0,
],
[
'id' => 2,
'name' => 'Drop down options (single section)',
'allow_multiple' => 0,
],
[
'id' => 3,
'name' => 'Drop down options (multiple section)',
'allow_multiple' => 1,
],
[
'id' => 4,
'name' => 'Check Boxes',
'allow_multiple' => 1,
],
];
//DB::table('question_types')->insert($question_types);
$currencies = [
[
'id' => 1,
'title' => 'U.S. Dollar',
'symbol_left' => '$',
'symbol_right' => '',
'code' => 'USD',
'decimal_place' => 2,
'value' => 1.00000000,
'decimal_point' => '.',
'id' => 1,
'title' => 'U.S. Dollar',
'symbol_left' => '$',
'symbol_right' => '',
'code' => 'USD',
'decimal_place' => 2,
'value' => 1.00000000,
'decimal_point' => '.',
'thousand_point' => ',',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
],
[
'id' => 2,
'title' => 'Euro',
'symbol_left' => '€',
'symbol_right' => '',
'code' => 'EUR',
'decimal_place' => 2,
'value' => 0.74970001,
'decimal_point' => '.',
'id' => 2,
'title' => 'Euro',
'symbol_left' => '€',
'symbol_right' => '',
'code' => 'EUR',
'decimal_place' => 2,
'value' => 0.74970001,
'decimal_point' => '.',
'thousand_point' => ',',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
],
[
'id' => 3,
'title' => 'Pound Sterling',
'symbol_left' => '£',
'symbol_right' => '',
'code' => 'GBP',
'decimal_place' => 2,
'value' => 0.62220001,
'decimal_point' => '.',
'id' => 3,
'title' => 'Pound Sterling',
'symbol_left' => '£',
'symbol_right' => '',
'code' => 'GBP',
'decimal_place' => 2,
'value' => 0.62220001,
'decimal_point' => '.',
'thousand_point' => ',',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
],
[
'id' => 4,
'title' => 'Australian Dollar',
'symbol_left' => '$',
'symbol_right' => '',
'code' => 'AUD',
'decimal_place' => 2,
'value' => 0.94790000,
'decimal_point' => '.',
'id' => 4,
'title' => 'Australian Dollar',
'symbol_left' => '$',
'symbol_right' => '',
'code' => 'AUD',
'decimal_place' => 2,
'value' => 0.94790000,
'decimal_point' => '.',
'thousand_point' => ',',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
],
[
'id' => 5,
'title' => 'Canadian Dollar',
'symbol_left' => '$',
'symbol_right' => '',
'code' => 'CAD',
'decimal_place' => 2,
'value' => 0.98500001,
'decimal_point' => '.',
'id' => 5,
'title' => 'Canadian Dollar',
'symbol_left' => '$',
'symbol_right' => '',
'code' => 'CAD',
'decimal_place' => 2,
'value' => 0.98500001,
'decimal_point' => '.',
'thousand_point' => ',',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
'status' => 1,
'created_at' => '2013-11-29 19:51:38',
'updated_at' => '2013-11-29 19:51:38',
],
// array(
// 'id' => 6,
@ -385,136 +351,171 @@ class ConstantsSeeder extends Seeder
DB::table('currencies')->insert($currencies);
\App\Models\DateTimeFormat::create(['format' => 'd/M/Y g:i a', 'label' => '10/Mar/2013']);
\App\Models\DateTimeFormat::create(['format' => 'd-M-Yk g:i a', 'label' => '10-Mar-2013']);
\App\Models\DateTimeFormat::create(['format' => 'd/F/Y g:i a', 'label' => '10/March/2013']);
\App\Models\DateTimeFormat::create(['format' => 'd-F-Y g:i a', 'label' => '10-March-2013']);
\App\Models\DateTimeFormat::create(['format' => 'M j, Y g:i a', 'label' => 'Mar 10, 2013 6:15 pm']);
\App\Models\DateTimeFormat::create(['format' => 'F j, Y g:i a', 'label' => 'March 10, 2013 6:15 pm']);
\App\Models\DateTimeFormat::create(['format' => 'D M jS, Y g:ia', 'label' => 'Mon March 10th, 2013 6:15 pm']);
\App\Models\DateTimeFormat::create([
'format' => 'd/M/Y g:i a',
'picker_format' => '',
'label' => '10/Mar/2016'
]);
\App\Models\DateTimeFormat::create([
'format' => 'd-M-Y g:i a',
'picker_format' => '',
'label' => '10-Mar-2016'
]);
\App\Models\DateTimeFormat::create([
'format' => 'd/F/Y g:i a',
'picker_format' => '',
'label' => '10/March/2016'
]);
\App\Models\DateTimeFormat::create([
'format' => 'd-F-Y g:i a',
'picker_format' => '',
'label' => '10-March-2016'
]);
\App\Models\DateTimeFormat::create([
'format' => 'M j, Y g:i a',
'picker_format' => '',
'label' => 'Mar 10, 2016 6:15 pm'
]);
\App\Models\DateTimeFormat::create([
'format' => 'F j, Y g:i a',
'picker_format' => '',
'label' => 'March 10, 2016 6:15 pm'
]);
\App\Models\DateTimeFormat::create([
'format' => 'D M jS, Y g:ia',
'picker_format' => '',
'label' => 'Mon March 10th, 2016 6:15 pm'
]);
\App\Models\DateFormat::create(['format' => 'd/M/Y', 'picker_format' => 'dd/M/yyyy', 'label' => '10/Mar/2013']);
\App\Models\DateFormat::create(['format' => 'd-M-Y', 'picker_format' => 'dd-M-yyyy', 'label' => '10-Mar-2013']);
\App\Models\DateFormat::create(['format' => 'd/F/Y', 'picker_format' => 'dd/MM/yyyy', 'label' => '10/March/2013']);
\App\Models\DateFormat::create(['format' => 'd-F-Y', 'picker_format' => 'dd-MM-yyyy', 'label' => '10-March-2013']);
\App\Models\DateFormat::create(['format' => 'M j, Y', 'picker_format' => 'M d, yyyy', 'label' => 'Mar 10, 2013']);
\App\Models\DateFormat::create(['format' => 'F j, Y', 'picker_format' => 'MM d, yyyy', 'label' => 'March 10, 2013']);
\App\Models\DateFormat::create(['format' => 'D M j, Y', 'picker_format' => 'D MM d, yyyy', 'label' => 'Mon March 10, 2013']);
\App\Models\DateFormat::create([
'format' => 'd/M/Y', 'picker_format' => 'dd/M/yyyy', 'label' => '10/Mar/2013']);
\App\Models\DateFormat::create([
'format' => 'd-M-Y', 'picker_format' => 'dd-M-yyyy', 'label' => '10-Mar-2013']);
\App\Models\DateFormat::create([
'format' => 'd/F/Y', 'picker_format' => 'dd/MM/yyyy', 'label' => '10/March/2013']);
\App\Models\DateFormat::create([
'format' => 'd-F-Y', 'picker_format' => 'dd-MM-yyyy', 'label' => '10-March-2013']);
\App\Models\DateFormat::create([
'format' => 'M j, Y', 'picker_format' => 'M d, yyyy', 'label' => 'Mar 10, 2013']);
\App\Models\DateFormat::create([
'format' => 'F j, Y', 'picker_format' => 'MM d, yyyy', 'label' => 'March 10, 2013']);
\App\Models\DateFormat::create([
'format' => 'D M j, Y', 'picker_format' => 'D MM d, yyyy', 'label' => 'Mon March 10, 2013']);
$timezones = [
'Pacific/Midway' => '(GMT-11:00) Midway Island',
'US/Samoa' => '(GMT-11:00) Samoa',
'US/Hawaii' => '(GMT-10:00) Hawaii',
'US/Alaska' => '(GMT-09:00) Alaska',
'US/Pacific' => '(GMT-08:00) Pacific Time (US &amp; Canada)',
'America/Tijuana' => '(GMT-08:00) Tijuana',
'US/Arizona' => '(GMT-07:00) Arizona',
'US/Mountain' => '(GMT-07:00) Mountain Time (US &amp; Canada)',
'America/Chihuahua' => '(GMT-07:00) Chihuahua',
'America/Mazatlan' => '(GMT-07:00) Mazatlan',
'America/Mexico_City' => '(GMT-06:00) Mexico City',
'America/Monterrey' => '(GMT-06:00) Monterrey',
'Canada/Saskatchewan' => '(GMT-06:00) Saskatchewan',
'US/Central' => '(GMT-06:00) Central Time (US &amp; Canada)',
'US/Eastern' => '(GMT-05:00) Eastern Time (US &amp; Canada)',
'US/East-Indiana' => '(GMT-05:00) Indiana (East)',
'America/Bogota' => '(GMT-05:00) Bogota',
'America/Lima' => '(GMT-05:00) Lima',
'America/Caracas' => '(GMT-04:30) Caracas',
'Canada/Atlantic' => '(GMT-04:00) Atlantic Time (Canada)',
'America/La_Paz' => '(GMT-04:00) La Paz',
'America/Santiago' => '(GMT-04:00) Santiago',
'Canada/Newfoundland' => '(GMT-03:30) Newfoundland',
'Pacific/Midway' => '(GMT-11:00) Midway Island',
'US/Samoa' => '(GMT-11:00) Samoa',
'US/Hawaii' => '(GMT-10:00) Hawaii',
'US/Alaska' => '(GMT-09:00) Alaska',
'US/Pacific' => '(GMT-08:00) Pacific Time (US &amp; Canada)',
'America/Tijuana' => '(GMT-08:00) Tijuana',
'US/Arizona' => '(GMT-07:00) Arizona',
'US/Mountain' => '(GMT-07:00) Mountain Time (US &amp; Canada)',
'America/Chihuahua' => '(GMT-07:00) Chihuahua',
'America/Mazatlan' => '(GMT-07:00) Mazatlan',
'America/Mexico_City' => '(GMT-06:00) Mexico City',
'America/Monterrey' => '(GMT-06:00) Monterrey',
'Canada/Saskatchewan' => '(GMT-06:00) Saskatchewan',
'US/Central' => '(GMT-06:00) Central Time (US &amp; Canada)',
'US/Eastern' => '(GMT-05:00) Eastern Time (US &amp; Canada)',
'US/East-Indiana' => '(GMT-05:00) Indiana (East)',
'America/Bogota' => '(GMT-05:00) Bogota',
'America/Lima' => '(GMT-05:00) Lima',
'America/Caracas' => '(GMT-04:30) Caracas',
'Canada/Atlantic' => '(GMT-04:00) Atlantic Time (Canada)',
'America/La_Paz' => '(GMT-04:00) La Paz',
'America/Santiago' => '(GMT-04:00) Santiago',
'Canada/Newfoundland' => '(GMT-03:30) Newfoundland',
'America/Buenos_Aires' => '(GMT-03:00) Buenos Aires',
'Greenland' => '(GMT-03:00) Greenland',
'Atlantic/Stanley' => '(GMT-02:00) Stanley',
'Atlantic/Azores' => '(GMT-01:00) Azores',
'Atlantic/Cape_Verde' => '(GMT-01:00) Cape Verde Is.',
'Africa/Casablanca' => '(GMT) Casablanca',
'Europe/Dublin' => '(GMT) Dublin',
'Europe/Lisbon' => '(GMT) Lisbon',
'Europe/London' => '(GMT) London',
'Africa/Monrovia' => '(GMT) Monrovia',
'Europe/Amsterdam' => '(GMT+01:00) Amsterdam',
'Europe/Belgrade' => '(GMT+01:00) Belgrade',
'Europe/Berlin' => '(GMT+01:00) Berlin',
'Europe/Bratislava' => '(GMT+01:00) Bratislava',
'Europe/Brussels' => '(GMT+01:00) Brussels',
'Europe/Budapest' => '(GMT+01:00) Budapest',
'Europe/Copenhagen' => '(GMT+01:00) Copenhagen',
'Europe/Ljubljana' => '(GMT+01:00) Ljubljana',
'Europe/Madrid' => '(GMT+01:00) Madrid',
'Europe/Paris' => '(GMT+01:00) Paris',
'Europe/Prague' => '(GMT+01:00) Prague',
'Europe/Rome' => '(GMT+01:00) Rome',
'Europe/Sarajevo' => '(GMT+01:00) Sarajevo',
'Europe/Skopje' => '(GMT+01:00) Skopje',
'Europe/Stockholm' => '(GMT+01:00) Stockholm',
'Europe/Vienna' => '(GMT+01:00) Vienna',
'Europe/Warsaw' => '(GMT+01:00) Warsaw',
'Europe/Zagreb' => '(GMT+01:00) Zagreb',
'Europe/Athens' => '(GMT+02:00) Athens',
'Europe/Bucharest' => '(GMT+02:00) Bucharest',
'Africa/Cairo' => '(GMT+02:00) Cairo',
'Africa/Harare' => '(GMT+02:00) Harare',
'Europe/Helsinki' => '(GMT+02:00) Helsinki',
'Europe/Istanbul' => '(GMT+02:00) Istanbul',
'Asia/Jerusalem' => '(GMT+02:00) Jerusalem',
'Europe/Kiev' => '(GMT+02:00) Kyiv',
'Europe/Minsk' => '(GMT+02:00) Minsk',
'Europe/Riga' => '(GMT+02:00) Riga',
'Europe/Sofia' => '(GMT+02:00) Sofia',
'Europe/Tallinn' => '(GMT+02:00) Tallinn',
'Europe/Vilnius' => '(GMT+02:00) Vilnius',
'Asia/Baghdad' => '(GMT+03:00) Baghdad',
'Asia/Kuwait' => '(GMT+03:00) Kuwait',
'Africa/Nairobi' => '(GMT+03:00) Nairobi',
'Asia/Riyadh' => '(GMT+03:00) Riyadh',
'Asia/Tehran' => '(GMT+03:30) Tehran',
'Europe/Moscow' => '(GMT+04:00) Moscow',
'Asia/Baku' => '(GMT+04:00) Baku',
'Europe/Volgograd' => '(GMT+04:00) Volgograd',
'Asia/Muscat' => '(GMT+04:00) Muscat',
'Asia/Tbilisi' => '(GMT+04:00) Tbilisi',
'Asia/Yerevan' => '(GMT+04:00) Yerevan',
'Asia/Kabul' => '(GMT+04:30) Kabul',
'Asia/Karachi' => '(GMT+05:00) Karachi',
'Asia/Tashkent' => '(GMT+05:00) Tashkent',
'Asia/Kolkata' => '(GMT+05:30) Kolkata',
'Asia/Kathmandu' => '(GMT+05:45) Kathmandu',
'Asia/Yekaterinburg' => '(GMT+06:00) Ekaterinburg',
'Asia/Almaty' => '(GMT+06:00) Almaty',
'Asia/Dhaka' => '(GMT+06:00) Dhaka',
'Asia/Novosibirsk' => '(GMT+07:00) Novosibirsk',
'Asia/Bangkok' => '(GMT+07:00) Bangkok',
'Asia/Jakarta' => '(GMT+07:00) Jakarta',
'Asia/Krasnoyarsk' => '(GMT+08:00) Krasnoyarsk',
'Asia/Chongqing' => '(GMT+08:00) Chongqing',
'Asia/Hong_Kong' => '(GMT+08:00) Hong Kong',
'Asia/Kuala_Lumpur' => '(GMT+08:00) Kuala Lumpur',
'Australia/Perth' => '(GMT+08:00) Perth',
'Asia/Singapore' => '(GMT+08:00) Singapore',
'Asia/Taipei' => '(GMT+08:00) Taipei',
'Asia/Ulaanbaatar' => '(GMT+08:00) Ulaan Bataar',
'Asia/Urumqi' => '(GMT+08:00) Urumqi',
'Asia/Irkutsk' => '(GMT+09:00) Irkutsk',
'Asia/Seoul' => '(GMT+09:00) Seoul',
'Asia/Tokyo' => '(GMT+09:00) Tokyo',
'Australia/Adelaide' => '(GMT+09:30) Adelaide',
'Australia/Darwin' => '(GMT+09:30) Darwin',
'Asia/Yakutsk' => '(GMT+10:00) Yakutsk',
'Australia/Brisbane' => '(GMT+10:00) Brisbane',
'Australia/Canberra' => '(GMT+10:00) Canberra',
'Pacific/Guam' => '(GMT+10:00) Guam',
'Australia/Hobart' => '(GMT+10:00) Hobart',
'Australia/Melbourne' => '(GMT+10:00) Melbourne',
'Greenland' => '(GMT-03:00) Greenland',
'Atlantic/Stanley' => '(GMT-02:00) Stanley',
'Atlantic/Azores' => '(GMT-01:00) Azores',
'Atlantic/Cape_Verde' => '(GMT-01:00) Cape Verde Is.',
'Africa/Casablanca' => '(GMT) Casablanca',
'Europe/Dublin' => '(GMT) Dublin',
'Europe/Lisbon' => '(GMT) Lisbon',
'Europe/London' => '(GMT) London',
'Africa/Monrovia' => '(GMT) Monrovia',
'Europe/Amsterdam' => '(GMT+01:00) Amsterdam',
'Europe/Belgrade' => '(GMT+01:00) Belgrade',
'Europe/Berlin' => '(GMT+01:00) Berlin',
'Europe/Bratislava' => '(GMT+01:00) Bratislava',
'Europe/Brussels' => '(GMT+01:00) Brussels',
'Europe/Budapest' => '(GMT+01:00) Budapest',
'Europe/Copenhagen' => '(GMT+01:00) Copenhagen',
'Europe/Ljubljana' => '(GMT+01:00) Ljubljana',
'Europe/Madrid' => '(GMT+01:00) Madrid',
'Europe/Paris' => '(GMT+01:00) Paris',
'Europe/Prague' => '(GMT+01:00) Prague',
'Europe/Rome' => '(GMT+01:00) Rome',
'Europe/Sarajevo' => '(GMT+01:00) Sarajevo',
'Europe/Skopje' => '(GMT+01:00) Skopje',
'Europe/Stockholm' => '(GMT+01:00) Stockholm',
'Europe/Vienna' => '(GMT+01:00) Vienna',
'Europe/Warsaw' => '(GMT+01:00) Warsaw',
'Europe/Zagreb' => '(GMT+01:00) Zagreb',
'Europe/Athens' => '(GMT+02:00) Athens',
'Europe/Bucharest' => '(GMT+02:00) Bucharest',
'Africa/Cairo' => '(GMT+02:00) Cairo',
'Africa/Harare' => '(GMT+02:00) Harare',
'Europe/Helsinki' => '(GMT+02:00) Helsinki',
'Europe/Istanbul' => '(GMT+02:00) Istanbul',
'Asia/Jerusalem' => '(GMT+02:00) Jerusalem',
'Europe/Kiev' => '(GMT+02:00) Kyiv',
'Europe/Minsk' => '(GMT+02:00) Minsk',
'Europe/Riga' => '(GMT+02:00) Riga',
'Europe/Sofia' => '(GMT+02:00) Sofia',
'Europe/Tallinn' => '(GMT+02:00) Tallinn',
'Europe/Vilnius' => '(GMT+02:00) Vilnius',
'Asia/Baghdad' => '(GMT+03:00) Baghdad',
'Asia/Kuwait' => '(GMT+03:00) Kuwait',
'Africa/Nairobi' => '(GMT+03:00) Nairobi',
'Asia/Riyadh' => '(GMT+03:00) Riyadh',
'Asia/Tehran' => '(GMT+03:30) Tehran',
'Europe/Moscow' => '(GMT+04:00) Moscow',
'Asia/Baku' => '(GMT+04:00) Baku',
'Europe/Volgograd' => '(GMT+04:00) Volgograd',
'Asia/Muscat' => '(GMT+04:00) Muscat',
'Asia/Tbilisi' => '(GMT+04:00) Tbilisi',
'Asia/Yerevan' => '(GMT+04:00) Yerevan',
'Asia/Kabul' => '(GMT+04:30) Kabul',
'Asia/Karachi' => '(GMT+05:00) Karachi',
'Asia/Tashkent' => '(GMT+05:00) Tashkent',
'Asia/Kolkata' => '(GMT+05:30) Kolkata',
'Asia/Kathmandu' => '(GMT+05:45) Kathmandu',
'Asia/Yekaterinburg' => '(GMT+06:00) Ekaterinburg',
'Asia/Almaty' => '(GMT+06:00) Almaty',
'Asia/Dhaka' => '(GMT+06:00) Dhaka',
'Asia/Novosibirsk' => '(GMT+07:00) Novosibirsk',
'Asia/Bangkok' => '(GMT+07:00) Bangkok',
'Asia/Jakarta' => '(GMT+07:00) Jakarta',
'Asia/Krasnoyarsk' => '(GMT+08:00) Krasnoyarsk',
'Asia/Chongqing' => '(GMT+08:00) Chongqing',
'Asia/Hong_Kong' => '(GMT+08:00) Hong Kong',
'Asia/Kuala_Lumpur' => '(GMT+08:00) Kuala Lumpur',
'Australia/Perth' => '(GMT+08:00) Perth',
'Asia/Singapore' => '(GMT+08:00) Singapore',
'Asia/Taipei' => '(GMT+08:00) Taipei',
'Asia/Ulaanbaatar' => '(GMT+08:00) Ulaan Bataar',
'Asia/Urumqi' => '(GMT+08:00) Urumqi',
'Asia/Irkutsk' => '(GMT+09:00) Irkutsk',
'Asia/Seoul' => '(GMT+09:00) Seoul',
'Asia/Tokyo' => '(GMT+09:00) Tokyo',
'Australia/Adelaide' => '(GMT+09:30) Adelaide',
'Australia/Darwin' => '(GMT+09:30) Darwin',
'Asia/Yakutsk' => '(GMT+10:00) Yakutsk',
'Australia/Brisbane' => '(GMT+10:00) Brisbane',
'Australia/Canberra' => '(GMT+10:00) Canberra',
'Pacific/Guam' => '(GMT+10:00) Guam',
'Australia/Hobart' => '(GMT+10:00) Hobart',
'Australia/Melbourne' => '(GMT+10:00) Melbourne',
'Pacific/Port_Moresby' => '(GMT+10:00) Port Moresby',
'Australia/Sydney' => '(GMT+10:00) Sydney',
'Asia/Vladivostok' => '(GMT+11:00) Vladivostok',
'Asia/Magadan' => '(GMT+12:00) Magadan',
'Pacific/Auckland' => '(GMT+12:00) Auckland',
'Pacific/Fiji' => '(GMT+12:00) Fiji',
'Australia/Sydney' => '(GMT+10:00) Sydney',
'Asia/Vladivostok' => '(GMT+11:00) Vladivostok',
'Asia/Magadan' => '(GMT+12:00) Magadan',
'Pacific/Auckland' => '(GMT+12:00) Auckland',
'Pacific/Fiji' => '(GMT+12:00) Fiji',
];
foreach ($timezones as $name => $location) {
@ -524,29 +525,29 @@ class ConstantsSeeder extends Seeder
$payment_gateways = [
[
'id' => 1,
'name' => 'Stripe',
'id' => 1,
'name' => 'Stripe',
'provider_name' => 'Stripe',
'provider_url' => 'https://www.stripe.com',
'is_on_site' => 1,
'can_refund' => 1,
'provider_url' => 'https://www.stripe.com',
'is_on_site' => 1,
'can_refund' => 1,
],
[
'id' => 2,
'name' => 'PayPal_Express',
'id' => 2,
'name' => 'PayPal_Express',
'provider_name' => 'PayPal Express',
'provider_url' => 'https://www.paypal.com',
'is_on_site' => 0,
'can_refund' => 0
'provider_url' => 'https://www.paypal.com',
'is_on_site' => 0,
'can_refund' => 0
],
[
'id' => 3,
'name' => 'Coinbase',
'id' => 3,
'name' => 'Coinbase',
'provider_name' => 'Coinbase',
'provider_url' => 'https://coinbase.com',
'is_on_site' => 0,
'can_refund' => 0,
'provider_url' => 'https://coinbase.com',
'is_on_site' => 0,
'can_refund' => 0,
],
];

2
public/assets/javascript/app.js
View File

@ -12,7 +12,7 @@ $(function () {
var $div = $("<div>", {id: "DatePicker"});
$("body").append($div);
$div.DateTimePicker({
dateTimeFormat: window.Attendize.DateTimeFormat
dateTimeFormat: Attendize.DateTimeFormat
});
});

2
public/assets/stylesheet/application.css
View File

File diff suppressed because one or more lines are too long

2
public/assets/stylesheet/frontend.css
View File

File diff suppressed because one or more lines are too long

2
public/assets/stylesheet/less/ui/form.less
View File

@ -186,7 +186,7 @@ input[type="checkbox"] {
.custom-radio > label,
.checkbox-icon > label {
position: relative;
padding-left: 18px;
padding-left: 25px;
cursor: pointer;
font-weight: normal;
margin: 0px;

4
resources/views/Emails/Layouts/Master.blade.php
View File

@ -51,7 +51,9 @@
<table style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;width: 100%">
<tr style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
<td align="center" style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
<p style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 14px;line-height: 1.6;color: #666;margin-bottom: 10px;font-weight: normal">Powered By <a href="https://www.attendize.com/?utm_source=email_footer" style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;color: #999">Attendize.com</a>.
{{--Attendize is provided free of charge on the condition the below hyperlink is left in place.--}}
{{--See https://github.com/Attendize/Attendize/blob/master/LICENSE for more information.--}}
<p style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 14px;line-height: 1.6;color: #666;margin-bottom: 10px;font-weight: normal">Powered By <a href="https://www.attendize.com/?email_footer_powered_by" style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;color: #999">Attendize.com</a>.
</p>
@yield('footer')
</td>

49
resources/views/ManageEvent/Customize.blade.php
View File

@ -300,41 +300,36 @@
<label class="control-label">Share buttons to show.</label>
<br>
<div class="checkbox checkbox-inline">
<label>
<div class="custom-checkbox mb5">
{!! Form::checkbox('social_show_facebook', 1, $event->social_show_facebook, ['data-toggle' => 'toggle']) !!}
Facebook
</label>
{!! Form::label('social_show_facebook', 'Facebook') !!}
</div>
<div class="checkbox checkbox-inline">
<label>
<div class="custom-checkbox mb5">
{!! Form::checkbox('social_show_twitter', 1, $event->social_show_twitter, ['data-toggle' => 'toggle']) !!}
Twitter
</label>
{!! Form::label('social_show_twitter', 'Twitter') !!}
</div>
<div class="checkbox checkbox-inline">
<label>
<div class="custom-checkbox mb5">
{!! Form::label('social_show_googleplus', 'Google+') !!}
{!! Form::checkbox('social_show_googleplus', 1, $event->social_show_googleplus, ['data-toggle' => 'toggle']) !!}
Google+
</label>
</div>
<div class="checkbox checkbox-inline">
<label>
{!! Form::checkbox('social_show_email', 1, $event->social_show_email, ['data-toggle' => 'toggle']) !!}
Email
</label>
<div class="custom-checkbox mb5">
{!! Form::checkbox('social_show_email', 1, $event->social_show_email, ['data-toggle' => 'toggle']) !!}
{!! Form::label('social_show_email', 'Email') !!}
</div>
<div class="checkbox checkbox-inline">
<label>
{!! Form::checkbox('social_show_linkedin', 1, $event->social_show_linkedin, ['data-toggle' => 'toggle']) !!}
LinkedIn
</label>
<div class="custom-checkbox mb5">
{!! Form::checkbox('social_show_linkedin', 1, $event->social_show_linkedin, ['data-toggle' => 'toggle']) !!}
{!! Form::label('social_show_linkedin', 'LinkedIn') !!}
</div>
<div class="checkbox checkbox-inline">
<label>
{!! Form::checkbox('social_show_whatsapp', 1, $event->social_show_whatsapp, ['data-toggle' => 'toggle']) !!}
WhatsApp
</label>
<div class="custom-checkbox">
{!! Form::checkbox('social_show_whatsapp', 1, $event->social_show_whatsapp, ['data-toggle' => 'toggle']) !!}
{!! Form::label('social_show_whatsapp', 'WhatsApp') !!}
</div>
</div>

155
resources/views/ManageEvent/Modals/CreateQuestion.blade.php
View File

@ -1,5 +1,4 @@
<div role="dialog" class="modal fade" style="display: none;">
<div role="dialog" class="modal fade" style="display: none;">
{!! Form::open(['url' => route('postCreateEventQuestion', ['event_id'=>$event->id]), 'id' => 'edit-question-form', 'class' => 'ajax']) !!}
<script id="question-option-template" type="text/template">
<tr>
@ -18,84 +17,92 @@
Create Question</h3>
</div>
<div class="modal-body">
<div class="form-group">
<label for="question-title" class="required">
Question
</label>
{!! Form::text('title', '', [
'id' => 'question-title',
'class' => 'form-control',
'placeholder' => 'e.g. Please enter your full address?',
]) !!}
</div>
<div class="form-group">
<label for="question-type">
Question Type
</label>
<div class="form-group">
<label for="question-title" class="required">
Question
</label>
{!! Form::text('title', '', [
'id' => 'question-title',
'class' => 'form-control',
'placeholder' => 'e.g. Please enter your full address?',
]) !!}
</div>
<div class="form-group">
<label for="question-type">
Question Type
</label>
<select id="question-type" class="form-control" name="question_type_id" onchange="changeQuestionType(this);">
@foreach ($question_types as $question_type)
<option data-has-options="{{$question_type->has_options}}" value="{{$question_type->id}}">
{{$question_type->name}}
</option>
@endforeach
</select>
</div>
<div class="form-group">
<label for="question-instructions">
Instructions
</label>
{!! Form::text('instructions', null, [
'id' => 'question-instructions',
'class' => 'form-control',
'placeholder' => 'e.g. Please enter your post code in the format XXX XX?'
]) !!}
</div>
<fieldset id="question-options" {!! empty($question->has_options) ? ' class="hide"' : '' !!}>
<legend>Question Options</legend>
<table class="table">
<thead>
<tr>
<th colspan="2">Option name</th>
</tr>
</thead>
<tbody>
<tr>
<td><input class="form-control" name="option[]" type="text" value=""></td>
<td width="50">
<i class="btn btn-danger ico-remove" onclick="removeQuestionOption(this);"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2">
<span id="add-question-option" class="btn btn-success btn-xs" onclick="addQuestionOption();">
<select id="question-type" class="form-control" name="question_type_id"
onchange="changeQuestionType(this);">
@foreach ($question_types as $question_type)
<option data-has-options="{{$question_type->has_options}}" value="{{$question_type->id}}">
{{$question_type->name}}
</option>
@endforeach
</select>
</div>
<div class="form-group">
<label for="question-instructions">
Instructions
</label>
{!! Form::text('instructions', null, [
'id' => 'question-instructions',
'class' => 'form-control',
'placeholder' => 'e.g. Please enter your post code in the format XXX XX?'
]) !!}
</div>
<fieldset id="question-options" {!! empty($question->has_options) ? ' class="hide"' : '' !!}>
<h4>Question Options</h4>
<table class="table table-bordered table-condensed">
<thead>
<tr>
<th colspan="2">Option name</th>
</tr>
</thead>
<tbody>
<tr>
<td><input class="form-control" name="option[]" type="text" value=""></td>
<td width="50">
<i class="btn btn-danger ico-remove" onclick="removeQuestionOption(this);"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2">
<span id="add-question-option" class="btn btn-success btn-xs"
onclick="addQuestionOption();">
<i class="ico-plus"></i>
Add another option
</span>
</td>
</tr>
</tfoot>
</table>
</fieldset>
</td>
</tr>
</tfoot>
</table>
</fieldset>
<div class="form-group">
{!! Form::checkbox('is_required', 'yes', false, ['data-toggle' => 'toggle', 'id' => 'is_required']) !!}
{!! Form::label('is_required', 'Make this a required question') !!}
</div>
<div class="form-group">
<label>
Require this question for ticket(s):
</label>
@foreach ($event->tickets as $ticket)
<br>
<input id="ticket_{{ $ticket->id }}" name="tickets[]" data-toggle = 'toggle' type="checkbox" value="{{ $ticket->id }}">
<label for="ticket_{{ $ticket->id }}">&nbsp; {{ $ticket->title }}</label>
@endforeach
<div class="form-group">
<div class="custom-checkbox">
{!! Form::checkbox('is_required', 'yes', false, ['data-toggle' => 'toggle', 'id' => 'is_required']) !!}
{!! Form::label('is_required', 'Make this a required question') !!}
</div>
</div>
<h4>
Require this question for ticket(s):
</h4>
<div class="form-group">
@foreach ($event->tickets as $ticket)
<div class="custom-checkbox mb5">
<input id="ticket_{{ $ticket->id }}" name="tickets[]" data-toggle='toggle' type="checkbox"
value="{{ $ticket->id }}">
<label for="ticket_{{ $ticket->id }}">&nbsp; {{ $ticket->title }}</label>
</div>
@endforeach
</div>
</div> <!-- /end modal body-->
<div class="modal-footer">

5
resources/views/Public/ViewEvent/Partials/EventOrganiserSection.blade.php
View File

@ -5,7 +5,6 @@
<div class="logo">
<img alt="{{$event->organiser->name}}" src="{{asset($event->organiser->full_logo_path)}}" property="logo">
</div>
<h3 property="name">
@if($event->organiser->enable_organiser_page)
<a href="{{route('showOrganiserHome', [$event->organiser->id, Str::slug($event->organiser->name)])}}" title="Organiser Page">
{{$event->organiser->name}}
@ -20,12 +19,12 @@
</p>
<p>
@if($event->organiser->facebook)
<a href="https://fb.com/{{$event->organiser->facebook}}" class="btn btn-facebook">
<a property="sameAs" href="https://fb.com/{{$event->organiser->facebook}}" class="btn btn-facebook">
<i class="ico-facebook"></i>&nbsp; Facebook
</a>
@endif
@if($event->organiser->twitter)
<a href="https://twitter.com/{{$event->organiser->twitter}}" class="btn btn-twitter">
<a property="sameAs" href="https://twitter.com/{{$event->organiser->twitter}}" class="btn btn-twitter">
<i class="ico-twitter"></i>&nbsp; Twitter
</a>
@endif

3
resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php
View File

@ -36,12 +36,13 @@
<div class="ticket-pricing" style="margin-right: 20px;">
@if($ticket->is_free)
FREE
<meta property="price" content="0">
@else
<?php
$is_free_event = false;
?>
<span title='{{money($ticket->price, $event->currency->code)}} Ticket Price + {{money($ticket->total_booking_fee, $event->currency->code)}} Booking Fees'>{{money($ticket->total_price, $event->currency->code)}} </span>
<meta property="priceCurrency" content="{{ $event->currency->code }}}">
<meta property="priceCurrency" content="{{ $event->currency->code }}">
<meta property="price" content="{{ number_format($ticket->price, 2, '.', '') }}">
@endif
</div>

2
resources/views/Shared/Layouts/Master.blade.php
View File

@ -84,6 +84,8 @@
href="javascript:void(0);"><span class="icon ico-cog"></span>Account Settings</a></li>
<li class="divider"></li>
<li><a target="_blank" href="https://www.attendize.com/feedback.php?v={{ config('attendize.version') }}"><span class="icon ico-megaphone"></span>Feedback / Bug Report</a></li>
<li class="divider"></li>
<li><a href="{{route('logout')}}"><span class="icon ico-exit"></span>Sign Out</a></li>
</ul>

33
resources/views/Shared/Partials/GlobalFooterJS.blade.php
View File

@ -1,21 +1,22 @@
@if(\Session::get('message'))
@if(session()->get('message'))
<script>showMessage('{{\Session::get('message')}}');</script>
@endif
<script>
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{env('GOOGLE_ANALYTICS_ID')}}', 'auto');
ga('require', 'displayfeatures');
ga('send', 'pageview');
@if(env('GOOGLE_ANALYTICS_ID'))
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{env('GOOGLE_ANALYTICS_ID')}}', 'auto');
ga('require', 'displayfeatures');
ga('send', 'pageview');
@endif
</script>