#1352:

* Anreise-Wochentag nun per Saison statt Objekt definierbar
* Anreise-Wochentag wird für buchbare Tage im Kalender berücksichtigt
* Kalenderblätter bis zum Ende des spätesten bekannten Saisonende
* Datepicker erlaubt nur noch mögliche Reiseenddaten anzuklicken im Fewo-Buchungsformular
* Algogrithmus zur Bestimmung buchbarer Kalendereinträge komplett umgeschrieben, da bisher Reservierungen von nur einer Nacht nicht berücksichtigt werden konnten
* Upload mehrerer Bilder gleichzeitig nun möglich
* Beim Upload von Bildern werden diese gleich in JPEG umgewandelt, komprimiert und für den Slider zugeschnitten
* Behoben: CRM-Export funktioniert teilweise nicht
* Für CMS-Template "overview" können nun twig-Variablen per JSON in Spalte cms_settings gesetzt werden (=> Kulturreisensuche ausblendbar für Fewo-Übersichtsseite)
* 

Sonstiges:
* Falls CRM-Export nicht funktioniert, wird dies in der Buchungs-Mail für den Service deutlich gemacht

SQL:

ALTER TABLE fewo_lodging DROP only_weekday;
ALTER TABLE fewo_season ADD only_weekday INT DEFAULT NULL;


git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3359 f459cee4-fb09-11de-96c3-f9c5f16c3c76

trunk/app/Resources/views/default/admin/fewoImage.html.twig

@@ -4,16 +4,20 @@
 {% block body %}
     <section class="clearfix">
         <div class="content-copy">
-            <h1>Neues Bild für "{{ lodging.name }}" anlegen</h1>
+            <h1>Bild für "{{ lodging.name }}" anlegen / bearbeiten</h1>
 
             <form class="st-booking-form" method="post" enctype="multipart/form-data">
 
                 {{ form_errors(form) }}
 
-                <div id="message"></div>
-
                 <div class="form-box">
-                    {{ form_row(form.file, {label: 'Bild'}) }}
+                    {% if is_new %}
+                        {{ form_row(form.file, {label: 'Bild'}) }}
+                    {% else %}
+                        <div>
+                            <img src="{{ asset('uploads/images/' ~ image_file_name) }}" alt="{{ image.description }}" style="width:456px;height:151px;" >
+                        </div>
+                    {% endif %}
                     {{ form_row(form.fileName, {label: 'Name'}) }}
                     {{ form_row(form.description, {label: 'Beschreibung'}) }}
 
@@ -25,7 +29,8 @@
                         </button>
                     </div>
                 </div><!-- end form-box -->
-                {{ form_rest(form) }}
+
+                {{ form_widget(form._token) }}
             </form>
             <a href="{{ '/admin/fewo/lodgings/' ~ lodging.id }}"
                class="btn btn-primary"

trunk/app/Resources/views/default/admin/fewoImageMultiUpload.html.twig

@@ -0,0 +1,35 @@
+{% extends 'admin.html.twig' %}
+{% form_theme form 'default/form/theme.html.twig' %}
+
+{% block body %}
+    <section class="clearfix">
+        <div class="content-copy">
+            <h1>Mehrere Bilder für "{{ lodging.name }}" hochladen</h1>
+
+            <form class="st-booking-form" method="post" enctype="multipart/form-data">
+
+                {{ form_errors(form) }}
+
+                <div class="form-box">
+                    {{ form(form) }}
+                    <br/>
+
+                    <div class="col-md-12 col-sm-12 col-xs-12">
+                        <button type="submit" value="SEND" id="submit"
+                                class="btn btn-primary btn-lg border-radius"
+                        >
+                            Speichern
+                        </button>
+                    </div>
+                </div>
+            </form>
+
+            <a href="{{ '/admin/fewo/lodgings/' ~ lodging.id }}"
+               class="btn btn-primary"
+               rel="nofollow"
+            >
+                Zurück
+            </a>
+        </div>
+    </section>
+{% endblock body %}

trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig

@@ -24,7 +24,6 @@
                     {{ 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'}) }}
 
                     {#
                     <div class="checkbox">
@@ -52,13 +51,17 @@
                         <tbody>
                             {% for image in lodging.images %}
                                 <tr>
-                                    <td><img src="{{ asset('uploads/images/' ~ image.file) }}" alt="{{ image.description }}" style="width:228px;height:128px;" ></td>
+                                    <td><img src="{{ asset('uploads/images/' ~ image.file) }}" alt="{{ image.description }}" style="width:228px;height:75px;" ></td>
                                     <td>{{ image.fileName }}</td>
                                     <td>{{ image.description }}</td>
                                     <td>
+                                        <a href="{{ '/admin/fewo/lodgings/' ~ lodging.id ~ '/images/' ~ image.id }}"
+                                           class="btn btn-primary"
+                                        >
+                                            Bearbeiten
+                                        </a>
                                         <a href="{{ '/admin/fewo/lodgings/' ~ lodging.id ~ '/images/' ~ image.id ~ '/delete' }}"
                                            class="btn btn-primary"
-                                           rel="nofollow"
                                         >
                                             Löschen
                                         </a>
@@ -71,12 +74,12 @@
                         <h4>Keine Bilder vorhanden</h4>
                     {% endif %}
 
-                    <a href="{{ '/admin/fewo/lodgings/' ~ lodging.id ~ '/images/new' }}"
-                       class="btn btn-primary"
-                       rel="nofollow"
-                    >
+                    <a href="{{ '/admin/fewo/lodgings/' ~ lodging.id ~ '/images/new' }}" class="btn btn-primary">
                         Hinzufügen
                     </a>
+                    <a href="/admin/fewo/lodgings/{{ lodging.id }}/images/multi-upload" class="btn btn-primary">
+                        Mehrere Bilder hochladen
+                    </a>
 
                     <br><br>
 

trunk/app/Resources/views/default/admin/lodgingsEditCalendar.html.twig

@@ -1,9 +1,9 @@
 <table class="table">
-{% for monthIndex in 0..11 %}
+{% for calendar_month in calendar %}
     <thead>
     <tr>
         <th colspan="7">
-            {{ calendar[monthIndex]['monthName'] }} {{ calendar[monthIndex]['year'] }}
+            {{ calendar_month['monthName'] }} {{ calendar_month['year'] }}
         </th>
     </tr>
     <tr>
@@ -21,7 +21,7 @@
         <tr>
             {% for dayIndex in 0..6 %}
                 {# @var dayState \AppBundle\Util\CalendarDayState #}
-                {% set dayState = calendar[monthIndex]['data'][(weekIndex * 7) + dayIndex] %}
+                {% set dayState = calendar_month['data'][(weekIndex * 7) + dayIndex] %}
 
                 {% set is_past_date = dayState.date is not empty and date(dayState.date) < date('now') %}
 
@@ -47,7 +47,7 @@
                             {{ dayState.day }}
                         </a>
                     {% elseif dayState.isBookable and not is_past_date %}
-                        <a href="/admin/fewo/lodgings/{{ lodging.id }}/reservations/new/{{ dayState.day < 10 ? '0':'' }}{{dayState.day}}{{ calendar[monthIndex]['monthNumber'] < 10 ? '0':'' }}{{calendar[monthIndex]['monthNumber']}}{{calendar[monthIndex]['year']}}">
+                        <a href="/admin/fewo/lodgings/{{ lodging.id }}/reservations/new/{{ dayState.day < 10 ? '0':'' }}{{dayState.day}}{{ calendar_month['monthNumber'] < 10 ? '0':'' }}{{calendar_month['monthNumber']}}{{calendar_month['year']}}">
                             {{ dayState.day }}
                         </a>
                     {% elseif dayState.day == 0 %}

trunk/app/Resources/views/default/admin/lodgingsNew.html.twig

@@ -24,7 +24,6 @@
                     {{ 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'}) }}
 
                     {#
                     <div class="checkbox">

trunk/app/Resources/views/default/admin/seasonsEdit.html.twig

@@ -18,8 +18,7 @@
                     {{ form_row(form.toDate, {label: 'Bis'}) }}
                     {{ form_row(form.minimumStay, {label: 'Mindestbelegung in Tagen'}) }}
                     {{ form_row(form.description, {label: 'Beschreibung'}) }}
-
-
+                    {{ form_row(form.onlyWeekday, {label: 'Exklusiver Wochentag'}) }}
 
                     <div class="col-md-12 col-sm-12 col-xs-12">
                         <button type="submit" value="SEND" id="submit"

trunk/app/Resources/views/default/admin/seasonsNew.html.twig

@@ -18,7 +18,7 @@
                     {{ form_row(form.toDate, {label: 'Bis'}) }}
                     {{ form_row(form.minimumStay, {label: 'Mindestbelegung in Tagen'}) }}
                     {{ form_row(form.description, {label: 'Beschreibung'}) }}
-
+                    {{ form_row(form.onlyWeekday, {label: 'Exklusiver Wochentag'}) }}
 
 
                     <div class="col-md-12 col-sm-12 col-xs-12">