diff --git a/.env.example b/.env.example index a4ba127b..ab7728b9 100644 --- a/.env.example +++ b/.env.example @@ -34,3 +34,9 @@ GOOGLE_MAPS_GEOCODING_KEY= TWITTER_WIDGET_ID= LOG=errorlog + +BOOKING_FEE=0.1 + +PAYMENT_API_URI= +PAYMENT_API_USER= +PAYMENT_API_PASSWORD= diff --git a/config/attendize.php b/config/attendize.php index eeb79775..765ea97e 100644 --- a/config/attendize.php +++ b/config/attendize.php @@ -41,7 +41,7 @@ return [ 'ticket_status_on_sale' => 4, 'ticket_status_off_sale' => 5, - 'ticket_booking_fee_fixed' => 0.1, + 'ticket_booking_fee_fixed' => env('BOOKING_FEE',0.1), 'ticket_booking_fee_percentage' => 0, /* Order statuses */ diff --git a/config/payment.php b/config/payment.php index ff0dd1f8..dd29625a 100644 --- a/config/payment.php +++ b/config/payment.php @@ -8,16 +8,16 @@ return [ 'card' =>[ 'config' => [ - 'base_uri' => 'https://mpi.gov.tm/payment/rest/', + 'base_uri' => env('PAYMENT_API_URI'), 'timeout' => 10, 'connect_timeout' => 10, 'verify' => true, 'http_errors' => false, ], 'params' => [ - 'userName' => '101131003020', - 'password' => 'Pr2d3gW1dh15', + 'userName' => env('PAYMENT_API_USER'), + 'password' => env('PAYMENT_API_PASSWORD'), 'language' => 'ru', ] ] -]; \ No newline at end of file +]; diff --git a/database/migrations/2014_03_26_180116_create_users_table.php b/database/migrations/2014_03_26_180116_create_users_table.php index 8434dc56..b9e62282 100644 --- a/database/migrations/2014_03_26_180116_create_users_table.php +++ b/database/migrations/2014_03_26_180116_create_users_table.php @@ -262,7 +262,7 @@ class CreateUsersTable extends Migration Schema::create('tickets', function ($t) { $t->increments('id'); - $t->nullableTimestamps(); + $t->nullableTimestamps(); $t->softDeletes(); $t->unsignedInteger('edited_by_user_id')->nullable();