Skip to content

Commit c9388ab

Browse files
authored
Merge pull request #85 from pilot/tickets-and-payments
Tickets and payments
2 parents 2cd95c4 + 376253f commit c9388ab

File tree

91 files changed

+6498
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+6498
-132
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ vendor/*
66
*/logs/*
77
*/cache/*
88
web/uploads/*
9+
!web/uploads/tickets/.gitkeep
910
web/bundles/*
1011
bin/*
1112

@@ -15,3 +16,4 @@ app/config/parameters.yml
1516

1617
composer.phar
1718
behat.yml
19+
.idea

app/AppKernel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function registerBundles()
2020
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
2121

2222
new Event\EventBundle\EventEventBundle(),
23+
new Knp\Bundle\SnappyBundle\KnpSnappyBundle(),
2324
);
2425

2526
if (in_array($this->getEnvironment(), array('dev', 'test'))) {

app/config/config.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ swiftmailer:
6262
host: %mailer_host%
6363
username: %mailer_user%
6464
password: %mailer_password%
65+
port: %mailer_port%
6566
spool: { type: memory }
6667

6768
# Event configuration
@@ -70,3 +71,18 @@ event_event:
7071
locales: {'ru_RU': 'ru', 'de_DE': 'de'}
7172
speech_languages: ['English', 'Russian', 'Other']
7273
speech_levels: ['For all attendees', 'Intermediate', 'Experts']
74+
75+
knp_snappy:
76+
temporary_folder: "%kernel.cache_dir%/snappy"
77+
process_timeout: 20
78+
pdf:
79+
enabled: true
80+
# binary: /usr/local/bin/wkhtmltopdf #"\"C:\\Program Files\\wkhtmltopdf\\bin\\wkhtmltopdf.exe\"" for Windows users
81+
# binary: %kernel.root_dir%/../vendor/h4cc/wkhtmltopdf-amd64/bin/wkhtmltopdf-amd64
82+
binary: %wkhtmltopdf.path%
83+
options: []
84+
image:
85+
enabled: true
86+
# binary: /usr/local/bin/wkhtmltoimage #"\"C:\\Program Files\\wkhtmltopdf\\bin\\wkhtmltoimage.exe\"" for Windows users
87+
binary: %wkhtmltoimg.path%
88+
options: []

app/config/parameters.yml.dist

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,10 @@ parameters:
2121
from_email: bot@email.com
2222

2323
admin_password: admin
24+
liqpay.publickey: i81503181518
25+
liqpay.privatekey: 0BKsMiFrdqh8VshE0iq7Ab5xSblonjGjEM1kWgUi
26+
liqpay.sandbox: 1
27+
wkhtmltopdf.path: %kernel.root_dir%/../vendor/h4cc/wkhtmltopdf-amd64/bin/wkhtmltopdf-amd64
28+
wkhtmltoimg.path: /usr/local/bin/wkhtmltoimage
29+
mail-from-name: Eventator
30+
user.locales: [en, ru]

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
"doctrine/common": "^2.6",
2727
"doctrine/orm": "^2.5",
2828
"doctrine/doctrine-bundle": "^1.6",
29-
"friendsofsymfony/jsrouting-bundle": "^1.6"
29+
"friendsofsymfony/jsrouting-bundle": "^1.6",
30+
"liqpay/liqpay": "^1.2",
31+
"knplabs/knp-snappy-bundle": "^1.5",
32+
"h4cc/wkhtmltopdf-amd64": "^0.12.3",
33+
"h4cc/wkhtmltopdf-i386": "^0.12.4"
3034
},
3135
"require-dev": {
3236
"behat/behat": "2.5.*",

composer.lock

Lines changed: 230 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)