gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1352

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3357 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2017-11-02 08:56:48 +00:00
parent 3bb0bb53a7
commit fd01254e8f
7 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig
View file

@ -24,7 +24,7 @@
{{ form_row(form.city, {'label': 'Ort'}) }}
{{ form_row(form.maximumPersons, {'label': 'Maximale Personenanzahl'}) }}
{{ form_row(form.deposit, {'label': 'Kaution'}) }}
{#{{ form_row(form.onlyWeekday, {'label': 'Exklusiver Wochentag'}) }}#}
{{ form_row(form.onlyWeekday, {'label': 'Exklusiver Wochentag'}) }}
{#
<div class="checkbox">

2
trunk/app/Resources/views/default/admin/lodgingsNew.html.twig
View file

@ -24,7 +24,7 @@
{{ form_row(form.city, {label: 'Ort'}) }}
{{ form_row(form.maximumPersons, {label: 'Maximale Personenanzahl'}) }}
{{ form_row(form.deposit, {label: 'Kaution'}) }}
{#{{ form_row(form.onlyWeekday, {label: 'Exklusiver Wochentag'}) }}#}
{{ form_row(form.onlyWeekday, {label: 'Exklusiver Wochentag'}) }}
{#
<div class="checkbox">

2
trunk/app/Resources/views/default/pages/cms/calendarLodgingProgram.html.twig
View file

@ -43,7 +43,7 @@
<td class="{{ cell_class }}">
{% if dayState.isBookable and not is_past_date %}
<a href="/fewo/{{ page.slug }}/fewo-buchen?pnr={{ dayState.price.id }}&fd={{ dayState.day < 10 ? '0':'' }}{{dayState.day}}{{ calendar[monthIndex]['monthNumber'] < 10 ? '0':'' }}{{calendar[monthIndex]['monthNumber']}}{{calendar[monthIndex]['year']}}"
<a href="{{ page.urlPath }}/buchen?pnr={{ dayState.price.id }}&fd={{ dayState.day < 10 ? '0':'' }}{{dayState.day}}{{ calendar[monthIndex]['monthNumber'] < 10 ? '0':'' }}{{calendar[monthIndex]['monthNumber']}}{{calendar[monthIndex]['year']}}"
style="color: #5a5a5a;"
rel="nofollow"
>

6
trunk/src/AppBundle/Controller/FewoBookingController.php
View file

@ -129,7 +129,7 @@ class FewoBookingController extends Controller
$perDayTotalPrice = $this->calculatePerDayTotalPrice($fewoBookingRequest, $price);
$fewoBookingRequest->setTotalPrice($totalPrice);
if($action == '/fewo-buchen')
if($action == '/buchen')
{
if ($request->getMethod() == 'POST' && $form->isValid())
@ -211,7 +211,7 @@ class FewoBookingController extends Controller
]);
}
elseif($action == '/fewo-berechne-gesamtpreis')
elseif($action == '/berechne-gesamtpreis')
{
return $this->render('default/components/booking/fewoSummary.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
@ -223,7 +223,7 @@ class FewoBookingController extends Controller
]);
}
throw new \Exception('Unknow FewoBookingController action: '. $action);
throw new \Exception('Unknown FewoBookingController action: '. $action);
}
public function calculatePrice(FewoBookingRequest $fewoBookingRequest, FewoLodging $fewoLodging, FewoPrice $fewoPrice)

2
trunk/src/AppBundle/Form/FewoLodgingType.php
View file

@ -65,14 +65,12 @@ class FewoLodgingType extends AbstractType
->add('deposit', null, [
'required' => true,
])
/*
->add('onlyWeekday', ChoiceType::class, [
'choices' => self::$WEEKDAY_CHOICES,
'constraints' => [
new Choice(['choices' => self::$WEEKDAY_CHOICES])
]
])
*/
//->add('calendarVisible')
->add('type', EntityType::class, [
'placeholder' => '(Bitte wählen) *',

5
trunk/src/AppBundle/Listener/KernelControllerListener.php
View file

@ -124,7 +124,7 @@ class KernelControllerListener
$request->attributes->set('page', $node);
if ($restOfPath && $node->getTravelProgram() != null && (
if ($node->getTravelProgram() != null && (
$restOfPath == '/buchen' || $restOfPath == '/berechne-gesamtpreis'))
{
// Special case: Booking actions
@ -145,7 +145,8 @@ class KernelControllerListener
}
$request->attributes->set('_controller', 'AppBundle:Cms:travelProgram');
}
elseif ($node->getFewoLodging() != null && ($restOfPath == '/fewo-buchen' || $restOfPath == '/fewo-berechne-gesamtpreis'))
elseif ($node->getFewoLodging() != null &&
($restOfPath == '/buchen' || $restOfPath == '/berechne-gesamtpreis'))
{
$request->attributes->set('fewoTravelProgramPage', $node);
$request->attributes->set('action', $restOfPath);

2
trunk/src/AppBundle/Resources/public/js/fewoBooking.js
View file

@ -11,7 +11,7 @@ $(document).ready(function() {
var tmp = location.href.split('?');
var tmp2 = tmp[0].split('/');
tmp2.pop();
var url = tmp2.join('/') + '/fewo-berechne-gesamtpreis';
var url = tmp2.join('/') + '/berechne-gesamtpreis';
if (tmp[1])
{
url += '?'+ tmp[1];