Reiseland Kontaktdaten, Rabatt API
This commit is contained in:
Kevin Adametz
parent
8f29c15a2b
commit
70704be1ea
30 changed files with 471 additions and 95 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<dataSource name="sterntours@localhost">
|
||||
<database-model serializer="dbm" dbms="MYSQL" family-id="MYSQL" format-version="4.15">
|
||||
<database-model serializer="dbm" dbms="MYSQL" family-id="MYSQL" format-version="4.16">
|
||||
<root id="1">
|
||||
<ServerVersion>5.7.25</ServerVersion>
|
||||
<DefaultEngine>InnoDB</DefaultEngine>
|
||||
|
|
@ -24,7 +24,6 @@
|
|||
</schema>
|
||||
<schema id="7" parent="1" name="information_schema">
|
||||
<Collation>utf8_general_ci</Collation>
|
||||
<Substituted>1</Substituted>
|
||||
</schema>
|
||||
<schema id="8" parent="1" name="inno-economic">
|
||||
<Collation>utf8_general_ci</Collation>
|
||||
|
|
@ -62,7 +61,6 @@
|
|||
<schema id="19" parent="1" name="sterntours">
|
||||
<Current>1</Current>
|
||||
<Collation>utf8_general_ci</Collation>
|
||||
<Visible>1</Visible>
|
||||
</schema>
|
||||
<schema id="20" parent="1" name="sunbird2">
|
||||
<Collation>utf8_general_ci</Collation>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<dataSource name="cmssso_db1@192.168.1.7">
|
||||
<database-model serializer="dbm" dbms="MYSQL" family-id="MYSQL" format-version="4.15">
|
||||
<database-model serializer="dbm" dbms="MYSQL" family-id="MYSQL" format-version="4.16">
|
||||
<root id="1">
|
||||
<ServerVersion>5.6.39</ServerVersion>
|
||||
<DefaultEngine>InnoDB</DefaultEngine>
|
||||
|
|
@ -10,11 +10,9 @@
|
|||
<schema id="2" parent="1" name="cmssso_db1">
|
||||
<Current>1</Current>
|
||||
<Collation>latin1_swedish_ci</Collation>
|
||||
<Visible>1</Visible>
|
||||
</schema>
|
||||
<schema id="3" parent="1" name="information_schema">
|
||||
<Collation>utf8_general_ci</Collation>
|
||||
<Substituted>1</Substituted>
|
||||
</schema>
|
||||
<schema id="4" parent="1" name="jugenr_db1">
|
||||
<Collation>latin1_swedish_ci</Collation>
|
||||
|
|
|
|||
80
.idea/workspace.xml
generated
80
.idea/workspace.xml
generated
|
|
@ -2,6 +2,7 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="e1ac1cea-a1a5-4c16-b5f0-5908c7d368de" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/app/Models/Sym/CmsContent.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171716_create_i_q_content_folders_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171717_create_i_q_content_files_table.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171718_create_i_q_content_categories_table.php" afterDir="false" />
|
||||
|
|
@ -12,12 +13,29 @@
|
|||
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFileTag.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFolder.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentTag.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/9538.pdf" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/dataSources/09ce12d1-7f68-4ce4-9ab1-0229d6366fdb.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/09ce12d1-7f68-4ce4-9ab1-0229d6366fdb.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/dataSources/f7aaeef3-b8e1-45ca-9f6a-b9476048d5dd.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/f7aaeef3-b8e1-45ca-9f6a-b9476048d5dd.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Booking.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Booking.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/BookingDraftItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/BookingDraftItem.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/DraftItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/DraftItem.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.phpstorm.meta.php" beforeDir="false" afterPath="$PROJECT_DIR$/.phpstorm.meta.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/_ide_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/_ide_helper_models.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper_models.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentCountryController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentCountryController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/CMSContent.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CMSContent.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/DraftType.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/DraftType.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Sym/TravelCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Sym/TravelCountry.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/TravelCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelCountry.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/helpers.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_19_114519_create_draft_types_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_19_114519_create_draft_types_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_travel_country_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_travel_country_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/composer.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/Controller.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/CropController.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/CropController.php" afterDir="false" />
|
||||
|
|
@ -61,6 +79,12 @@
|
|||
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/demo.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/demo.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de/_vorlagen.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/_vorlagen.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/cms/content/country/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/content/country/detail.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
|
@ -250,10 +274,19 @@
|
|||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="database.console.LAST_STATE" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/views/drafts" />
|
||||
<property name="js.buildTools.grunt.grunt-cli.package" value="" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/Models/Sym" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/app/Models/Sym" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/drafts" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/cms/content/country" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers/CMS" />
|
||||
<recent name="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/booking" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/cms/content/all" />
|
||||
|
|
@ -261,13 +294,11 @@
|
|||
<recent name="$PROJECT_DIR$/resources/views/travel/user" />
|
||||
<recent name="$PROJECT_DIR$/database/migrations" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/drafts" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/cms/content/country" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers/CMS" />
|
||||
<recent name="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models" />
|
||||
<recent name="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunAnythingCache">
|
||||
<option name="myCommands">
|
||||
<command value="composer run-script" />
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
|
|
@ -281,6 +312,27 @@
|
|||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration default="true" type="ShConfigurationType">
|
||||
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
|
||||
<option name="SCRIPT_OPTIONS" value="" />
|
||||
<option name="INTERPRETER_PATH" value="/bin/bash" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="composer-post-update.sh" type="ShConfigurationType">
|
||||
<option name="SCRIPT_PATH" value="$USER_HOME$/Documents/scripts/composer-post-update.sh" />
|
||||
<option name="SCRIPT_OPTIONS" value="" />
|
||||
<option name="INTERPRETER_PATH" value="/bin/bash" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration default="true" type="js.build_tools.grunt">
|
||||
<node-interpreter value="project" />
|
||||
<envs />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
|
|
@ -467,6 +519,12 @@
|
|||
<workItem from="1570010041021" duration="13159000" />
|
||||
<workItem from="1570440959362" duration="1814000" />
|
||||
<workItem from="1570449222555" duration="504000" />
|
||||
<workItem from="1572872356898" duration="6931000" />
|
||||
<workItem from="1572943803053" duration="4940000" />
|
||||
<workItem from="1572971744716" duration="11000" />
|
||||
<workItem from="1573130776386" duration="3387000" />
|
||||
<workItem from="1573140295137" duration="437000" />
|
||||
<workItem from="1573141708026" duration="989000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace PHPSTORM_META {
|
|||
|
||||
/**
|
||||
* PhpStorm Meta file, to provide autocomplete information for PhpStorm
|
||||
* Generated on 2019-08-14 12:31:25.
|
||||
* Generated on 2019-11-05 14:44:36.
|
||||
*
|
||||
* @author Barry vd. Heuvel <barryvdh@gmail.com>
|
||||
* @see https://github.com/barryvdh/laravel-ide-helper
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
/**
|
||||
* A helper file for Laravel 5, to provide autocomplete information to your IDE
|
||||
* Generated for Laravel 5.8.32 on 2019-08-14 12:31:25.
|
||||
* Generated for Laravel 5.8.32 on 2019-11-05 14:44:35.
|
||||
*
|
||||
* This file should not be included in your code, only analyzed by your IDE!
|
||||
*
|
||||
|
|
|
|||
|
|
@ -92,10 +92,53 @@ namespace App\Models\Sym{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry query()
|
||||
* @property string|null $contact_headline
|
||||
* @property string|null $contact_text_1
|
||||
* @property string|null $contact_text_2
|
||||
* @property string|null $contact_text_3
|
||||
* @property string|null $contact_text_4
|
||||
* @property string|null $contact_footer
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactFooter($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactHeadline($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText1($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText2($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText3($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText4($value)
|
||||
*/
|
||||
class TravelCountry extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models\Sym{
|
||||
/**
|
||||
* App\Models\Sym\CmsContent
|
||||
*
|
||||
* @property int $id
|
||||
* @property string $name
|
||||
* @property string $slug
|
||||
* @property string $field
|
||||
* @property string|null $text
|
||||
* @property string|null $full_text
|
||||
* @property int|null $integer
|
||||
* @property float|null $decimal
|
||||
* @property string|null $created_at
|
||||
* @property string|null $updated_at
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereDecimal($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereField($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereFullText($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereInteger($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereName($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereSlug($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereText($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereUpdatedAt($value)
|
||||
*/
|
||||
class CmsContent extends \Eloquent {}
|
||||
}
|
||||
|
||||
namespace App\Models\Sym{
|
||||
/**
|
||||
* App\Models\Sym\ArrangementTemplate
|
||||
|
|
@ -823,6 +866,24 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry query()
|
||||
* @property string|null $slug
|
||||
* @property string|null $text_before
|
||||
* @property string|null $text_after
|
||||
* @property string|null $contact_headline
|
||||
* @property string|null $contact_text_1
|
||||
* @property string|null $contact_text_2
|
||||
* @property string|null $contact_text_3
|
||||
* @property string|null $contact_text_4
|
||||
* @property string|null $contact_footer
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactFooter($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactHeadline($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText1($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText2($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText3($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText4($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereSlug($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextAfter($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextBefore($value)
|
||||
*/
|
||||
class TravelCountry extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -1307,6 +1368,8 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType query()
|
||||
* @property int|null $pos
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType wherePos($value)
|
||||
*/
|
||||
class DraftType extends \Eloquent {}
|
||||
}
|
||||
|
|
@ -1397,6 +1460,8 @@ namespace App\Models{
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereTravelBookingFewoChannelId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereTravelUserId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereUpdatedAt($value)
|
||||
* @property string|null $last_change_at
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereLastChangeAt($value)
|
||||
*/
|
||||
class TravelUserBookingFewo extends \Eloquent {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -162,8 +162,8 @@ class DraftController extends Controller
|
|||
|
||||
$room_adult += $room['adult'];
|
||||
$room_children += $room['children'];
|
||||
$room_price_adult += ($room['price_adult'] * $room['adult']);
|
||||
$room_price_children += ($room['price_children'] * $room['children']);
|
||||
$room_price_adult += ($room['price_adult_full'] * $room['adult']);
|
||||
$room_price_children += ($room['price_children_full'] * $room['children']);
|
||||
|
||||
if(isset($room_names[$room['name']])){
|
||||
$room_names[$room['name']] = $room_names[$room['name']]+1;
|
||||
|
|
@ -188,9 +188,9 @@ class DraftController extends Controller
|
|||
'start_date' => $data['startDateStr'],
|
||||
'end_date' => $data['endDateStr'],
|
||||
'service' => $service,
|
||||
'price_adult' => $room['price_adult'],
|
||||
'price_adult' => $room['price_adult_full'],
|
||||
'adult' => $room['adult'],
|
||||
'price_children' => $room['price_children'],
|
||||
'price_children' => $room['price_children_full'],
|
||||
'children' => $room['children'],
|
||||
'pos' => 0,
|
||||
'in_pdf' => true,
|
||||
|
|
@ -375,6 +375,41 @@ class DraftController extends Controller
|
|||
'comfort' => $data['comfort']
|
||||
];
|
||||
}
|
||||
|
||||
$price_info_travel_discounts = [];
|
||||
|
||||
foreach ($data['discount'] as $travel_discount){
|
||||
|
||||
$service = trans('_vorlagen.aufpreis_option');
|
||||
$this->option = "";
|
||||
$service = $this->replaceService($service);
|
||||
|
||||
if($travel_discount['price'] > 0){
|
||||
$travel_discount['price'] = $travel_discount['price']*-1;
|
||||
}
|
||||
$price_info_travel_options[] = [
|
||||
'booking_id' => $data['booking_id'],
|
||||
'travel_program_id' => $data['travel_program_id'],
|
||||
'fewo_lodging_id' => null,
|
||||
'travel_class_id' => null,
|
||||
'draft_item_id' => null,
|
||||
'draft_type_id' => 42,
|
||||
'request_date' => $data['request_date'],
|
||||
'days_start' => null,
|
||||
'days_duration' => null,
|
||||
'start_date' => null,
|
||||
'end_date' => null,
|
||||
'service' => $service,
|
||||
'price_adult' => $travel_discount['price'],
|
||||
'adult' => $travel_discount['count'],
|
||||
'price_children' => 0,
|
||||
'children' => 0,
|
||||
'pos' => 0,
|
||||
'in_pdf' => true,
|
||||
'comfort' => $data['comfort']
|
||||
];
|
||||
}
|
||||
|
||||
$info_texts = [];
|
||||
$last_post = 0;
|
||||
foreach ($draft->draft_items as $draft_item){
|
||||
|
|
@ -522,6 +557,15 @@ class DraftController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
//set travel discount prices
|
||||
if(count($price_info_travel_discounts)){
|
||||
foreach ($price_info_travel_discounts as $price_info_travel_discount){
|
||||
$last_post ++;
|
||||
$price_info_travel_option['pos'] = $last_post;
|
||||
BookingDraftItem::create($price_info_travel_option);
|
||||
}
|
||||
}
|
||||
|
||||
//set travel options prices
|
||||
if(count($info_texts)){
|
||||
foreach ($info_texts as $info_text){
|
||||
|
|
|
|||
|
|
@ -50,12 +50,20 @@ class CMSContentController extends Controller
|
|||
return back()->withErrors($validator);
|
||||
}
|
||||
|
||||
if($data['id'] == "new"){
|
||||
if($data['id'] === "new"){
|
||||
CMSContent::create($data);
|
||||
//store in cms old Datebase
|
||||
\App\Models\Sym\CmsContent::create($data);
|
||||
}else{
|
||||
|
||||
$model = CMSContent::find($data['id']);
|
||||
$model->fill($data);
|
||||
$model->save();
|
||||
|
||||
$m = \App\Models\Sym\CmsContent::find($data['id']);
|
||||
$m->fill($data);
|
||||
$m->save();
|
||||
|
||||
}
|
||||
\Session()->flash('alert-save', '1');
|
||||
return redirect(route('cms_content_all'));
|
||||
|
|
|
|||
|
|
@ -54,7 +54,9 @@ class CMSContentCountryController extends Controller
|
|||
{
|
||||
|
||||
$data = Input::all();
|
||||
|
||||
if(!isset($data['contact_lands'])){
|
||||
$data['contact_lands'] = null;
|
||||
}
|
||||
$model = TravelCountry::findOrFail($id);
|
||||
$model->fill($data);
|
||||
$model->save();
|
||||
|
|
|
|||
|
|
@ -151,12 +151,15 @@ class DraftController extends Controller
|
|||
'name' => $data['name'],
|
||||
'active' => isset($data['active']) ? true : false,
|
||||
'color' => $data['color'],
|
||||
'pos' => $data['pos'],
|
||||
]);
|
||||
}else{
|
||||
$draft_type = DraftType::find($data['id']);
|
||||
$draft_type->name = $data['name'];
|
||||
$draft_type->active = isset($data['active']) ? true : false;
|
||||
$draft_type->color = $data['color'];
|
||||
$draft_type->pos = $data['pos'];
|
||||
|
||||
|
||||
$draft_type->save();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ class HomeController extends Controller
|
|||
|
||||
public function checkLogin($identify, $token, $show = false)
|
||||
{
|
||||
|
||||
if($identify){
|
||||
//user find by $identify
|
||||
$user = User::where('identify', '=', $identify)->first();
|
||||
|
|
@ -83,9 +84,11 @@ class HomeController extends Controller
|
|||
return abort(404);
|
||||
|
||||
}
|
||||
|
||||
if($sf_guard_user->token != $token){
|
||||
return abort(404);
|
||||
}
|
||||
|
||||
$time = Carbon::parse($sf_guard_user->token_at);
|
||||
$now = Carbon::now();
|
||||
$duration = $time->diffInSeconds($now);
|
||||
|
|
@ -123,6 +126,10 @@ class HomeController extends Controller
|
|||
if($show == 'travel_country'){
|
||||
return redirect(route('admin_settings_travel_country'));
|
||||
}
|
||||
if($show == 'cms_content_country'){
|
||||
return redirect(route('cms_content_country'));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -201,9 +201,16 @@ class TravelUserBookingFewoController extends Controller
|
|||
})
|
||||
->addColumn('is_calendar', function (TravelUserBookingFewo $travel_user_booking_fewo) {
|
||||
$back = "";
|
||||
$back .= $travel_user_booking_fewo->is_calendar_fewo_direct ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
$back .= $travel_user_booking_fewo->is_calendar_hrs ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
$back .= $travel_user_booking_fewo->is_calendar_stern_tours ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
$back .= get_active_badge($travel_user_booking_fewo->is_calendar_fewo_direct, "FEWO Direkt")." ";
|
||||
$back .= get_active_badge($travel_user_booking_fewo->is_calendar_hrs, "HRS")." ";
|
||||
$back .= get_active_badge($travel_user_booking_fewo->is_calendar_stern_tours, "STERN TOURS");
|
||||
return $back;
|
||||
})
|
||||
->addColumn('is_mail', function (TravelUserBookingFewo $travel_user_booking_fewo) {
|
||||
$back = "";
|
||||
$back .= get_active_badge($travel_user_booking_fewo->isSendUserMail(), "Mietbestätigung")." ";
|
||||
$back .= get_active_badge($travel_user_booking_fewo->isSendInfoMail(), "Anrreiseinfo")." ";
|
||||
$back .= get_active_badge($travel_user_booking_fewo->isSendServiceMail(), "Dienstleister Mail");
|
||||
return $back;
|
||||
})
|
||||
->addColumn('status_name', function (TravelUserBookingFewo $travel_user_booking_fewo) {
|
||||
|
|
@ -212,7 +219,7 @@ class TravelUserBookingFewoController extends Controller
|
|||
->addColumn('action_delete', function (TravelUserBookingFewo $travel_user_booking_fewo) {
|
||||
return '<a href="' . route('travel_user_booking_fewo_delete', [$travel_user_booking_fewo->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>';
|
||||
})
|
||||
->rawColumns(['action_edit', 'fewo_lodging', 'travel_user', 'is_calendar', 'action_delete'])
|
||||
->rawColumns(['action_edit', 'fewo_lodging', 'travel_user', 'is_calendar', 'is_mail', 'action_delete'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace App\Models;
|
|||
|
||||
use Cviebrock\EloquentSluggable\Sluggable;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
/**
|
||||
* App\Models\CMSContent
|
||||
*
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ use Illuminate\Database\Eloquent\Model;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType query()
|
||||
* @property int|null $pos
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\DraftType wherePos($value)
|
||||
*/
|
||||
class DraftType extends Model
|
||||
{
|
||||
|
|
@ -32,7 +34,7 @@ class DraftType extends Model
|
|||
protected $table = 'draft_types';
|
||||
|
||||
protected $fillable = [
|
||||
'name', 'active', 'color',
|
||||
'name', 'active', 'color', 'pos'
|
||||
];
|
||||
|
||||
public function draft_items()
|
||||
|
|
|
|||
88
app/Models/Sym/CmsContent.php
Normal file
88
app/Models/Sym/CmsContent.php
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models\Sym;
|
||||
|
||||
use Cviebrock\EloquentSluggable\Sluggable;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
|
||||
/**
|
||||
* App\Models\Sym\CmsContent
|
||||
*
|
||||
* @property int $id
|
||||
* @property string $name
|
||||
* @property string $slug
|
||||
* @property string $field
|
||||
* @property string|null $text
|
||||
* @property string|null $full_text
|
||||
* @property int|null $integer
|
||||
* @property float|null $decimal
|
||||
* @property string|null $created_at
|
||||
* @property string|null $updated_at
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent query()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereCreatedAt($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereDecimal($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereField($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereFullText($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereInteger($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereName($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereSlug($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereText($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereUpdatedAt($value)
|
||||
* @mixin \Eloquent
|
||||
*/
|
||||
class CmsContent extends Model
|
||||
{
|
||||
|
||||
use Sluggable;
|
||||
|
||||
protected $connection = 'mysql';
|
||||
|
||||
protected $table = 'cms_contents';
|
||||
|
||||
protected $fillable = [
|
||||
'name', 'slug', 'field', 'text', 'full_text', 'integer', 'decimal',
|
||||
];
|
||||
|
||||
public $timestamps = false;
|
||||
|
||||
public function sluggable()
|
||||
{
|
||||
return [
|
||||
'slug' => [
|
||||
'source' => 'name'
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
public function _format_number($value){
|
||||
return preg_replace("/[^0-9,]/", "", $value);
|
||||
}
|
||||
|
||||
public function setDecimalAttribute($value)
|
||||
{
|
||||
$value = $this->_format_number($value);
|
||||
$value = substr($value, -13);
|
||||
$this->attributes['decimal'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
|
||||
public function getDecimalAttribute()
|
||||
{
|
||||
if(isset($this->attributes['decimal'])){
|
||||
// 2 = decimal places | '.' = decimal seperator | ',' = thousand seperator
|
||||
return number_format(($this->attributes['decimal']), 2, ',', '.');
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public function setIntegerAttribute($value)
|
||||
{
|
||||
$value = $this->_format_number($value);
|
||||
$value = substr($value, -10);
|
||||
$this->attributes['integer'] = intval($value);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,6 +20,18 @@ use Illuminate\Database\Eloquent\Model;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry query()
|
||||
* @property string|null $contact_headline
|
||||
* @property string|null $contact_text_1
|
||||
* @property string|null $contact_text_2
|
||||
* @property string|null $contact_text_3
|
||||
* @property string|null $contact_text_4
|
||||
* @property string|null $contact_footer
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactFooter($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactHeadline($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText1($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText2($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText3($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText4($value)
|
||||
*/
|
||||
class TravelCountry extends Model
|
||||
{
|
||||
|
|
@ -32,6 +44,7 @@ class TravelCountry extends Model
|
|||
'name',
|
||||
'is_customer_country',
|
||||
'active_backend',
|
||||
'contact_lands',
|
||||
'contact_headline',
|
||||
'contact_text_1',
|
||||
'contact_text_2',
|
||||
|
|
@ -41,6 +54,9 @@ class TravelCountry extends Model
|
|||
|
||||
];
|
||||
|
||||
protected $casts = ['contact_lands' => 'array'];
|
||||
|
||||
|
||||
public $timestamps = false;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,24 @@ use Illuminate\Support\Str;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry newModelQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry newQuery()
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry query()
|
||||
* @property string|null $slug
|
||||
* @property string|null $text_before
|
||||
* @property string|null $text_after
|
||||
* @property string|null $contact_headline
|
||||
* @property string|null $contact_text_1
|
||||
* @property string|null $contact_text_2
|
||||
* @property string|null $contact_text_3
|
||||
* @property string|null $contact_text_4
|
||||
* @property string|null $contact_footer
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactFooter($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactHeadline($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText1($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText2($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText3($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactText4($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereSlug($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextAfter($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextBefore($value)
|
||||
*/
|
||||
class TravelCountry extends Model
|
||||
{
|
||||
|
|
@ -52,6 +70,7 @@ class TravelCountry extends Model
|
|||
'html_information',
|
||||
'text_before',
|
||||
'text_after',
|
||||
'contact_lands',
|
||||
'contact_headline',
|
||||
'contact_text_1',
|
||||
'contact_text_2',
|
||||
|
|
@ -65,6 +84,9 @@ class TravelCountry extends Model
|
|||
|
||||
];
|
||||
|
||||
protected $casts = ['contact_lands' => 'array'];
|
||||
|
||||
|
||||
public $timestamps = false;
|
||||
|
||||
public function travel_program_country()
|
||||
|
|
|
|||
|
|
@ -96,6 +96,8 @@ use App\Services\Util;
|
|||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereTravelBookingFewoChannelId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereTravelUserId($value)
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereUpdatedAt($value)
|
||||
* @property string|null $last_change_at
|
||||
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelUserBookingFewo whereLastChangeAt($value)
|
||||
*/
|
||||
class TravelUserBookingFewo extends Model
|
||||
{
|
||||
|
|
@ -670,4 +672,27 @@ class TravelUserBookingFewo extends Model
|
|||
$this->travel_user->first_name." ".$this->travel_user->last_name." | ".$this->from_date." - ".$this->to_date." | ".$this->adults." + ".$this->children." (Erwachsene + Kinder)";
|
||||
}
|
||||
|
||||
public function isSendUserMail(){
|
||||
if($this->send_user_mail != NULL){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function isSendInfoMail(){
|
||||
if($this->send_info_mail != NULL){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function isSendServiceMail(){
|
||||
if($this->send_service_mail != NULL){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ class HTMLHelper
|
|||
}
|
||||
|
||||
public static function getDraftTypes($setId = false){
|
||||
$options = DraftType::all()->sortByDesc('id');
|
||||
$options = DraftType::all()->sortByDesc('id')->sortByDesc('pos');
|
||||
$ret = "";
|
||||
foreach ($options as $option){
|
||||
$attr = ($option->id == $setId) ? 'selected="selected"' : '';
|
||||
|
|
@ -165,17 +165,23 @@ class HTMLHelper
|
|||
}
|
||||
|
||||
public static function getTravelCountriesOptions($countryId = false){
|
||||
|
||||
$checked = [];
|
||||
if($countryId){
|
||||
!is_array($countryId) ? $checked = array($countryId) : $checked = $countryId;
|
||||
}
|
||||
|
||||
$options = TravelCountry::where('active_backend',1)->get();
|
||||
$ret = '';
|
||||
foreach ($options as $option){
|
||||
$attr = ($option->crm_id === $countryId) ? 'selected="selected"' : '';
|
||||
$attr = (in_array($option->crm_id, $checked)) ? 'selected="selected"' : '';
|
||||
$ret .= '<option value="'.$option->crm_id.'" '.$attr.'>'.$option->name.'</option>\n';
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
public static function getTravelUserOptions($id = false){
|
||||
$options = TravelUser::all();
|
||||
public static function getTravelUserOptions($id = false, $order = "ASC"){
|
||||
$options = TravelUser::orderBy('id', $order)->get();
|
||||
$ret = '';
|
||||
foreach ($options as $option){
|
||||
$attr = ($option->id === $id) ? 'selected="selected"' : '';
|
||||
|
|
|
|||
|
|
@ -35,8 +35,12 @@ class Util
|
|||
}
|
||||
|
||||
public static function _clean_float($value){
|
||||
$groups = explode(".", preg_replace("/[^0-9.]/", "", str_replace(',', '.', $value)));
|
||||
$lastGroup = array_pop($groups);
|
||||
|
||||
$groups = explode(".", preg_replace("/[^0-9.-]/", "", str_replace(',', '.', $value)));
|
||||
$lastGroup = 0;
|
||||
if(count($groups) > 1){
|
||||
$lastGroup = array_pop($groups);
|
||||
}
|
||||
$number = implode('', $groups);
|
||||
return (strlen($lastGroup) < 3) ? floatval($number.'.'.$lastGroup) : floatval($number.$lastGroup);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,12 +46,16 @@ if (! function_exists('pre_slug')) {
|
|||
|
||||
|
||||
if (! function_exists('get_active_badge')) {
|
||||
function get_active_badge($active)
|
||||
function get_active_badge($active, $tooltip = false, $pos = "top")
|
||||
{
|
||||
return $active ? '<span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
if($tooltip){
|
||||
$tooltip = 'data-toggle="tooltip" data-placement="top" data-original-title="'.$tooltip.'"';
|
||||
}
|
||||
return $active ? '<span class="badge badge-pill badge-success" '.$tooltip.'><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger" '.$tooltip.'><i class="far fa-times"></i></span>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (! function_exists('get_switcher_input')) {
|
||||
function get_switcher_input($active = false, $name = "", $label = "")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ class CreateDraftTypesTable extends Migration
|
|||
$table->string('name');
|
||||
$table->string('color', 10)->nullable();
|
||||
$table->boolean('active')->default(true);
|
||||
$table->unsignedTinyInteger('pos')->default(0);
|
||||
|
||||
$table->timestamps();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ class CreateTravelCountryTable extends Migration
|
|||
$table->string('text_before')->nullable();
|
||||
$table->string('text_after')->nullable();
|
||||
|
||||
$table->string('contact_lands')->nullable();
|
||||
$table->string('contact_headline')->nullable();
|
||||
$table->text('contact_text_1')->nullable();
|
||||
$table->text('contact_text_2')->nullable();
|
||||
|
|
|
|||
|
|
@ -5,4 +5,5 @@
|
|||
'aufpreis_kategorie' => 'pro Person: #Kategorie#',
|
||||
'aufpreis_flug' => 'Aufschlag für Abfahrts-/Abflugort pro Person: ab #Flughafen#',
|
||||
'aufpreis_option' => 'pro Person: #Option#',
|
||||
'rabatt' => 'Rabatt',
|
||||
);
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
<td>
|
||||
{{ Form::text('draft_item['.$booking_draft_item->id.'][end_date]', $booking_draft_item->end_date, array('placeholder'=>__('End Datum'), 'class'=>'form-control datepicker-base', 'id'=>'draft_item_'.$booking_draft_item->id.'_end_date')) }}
|
||||
</td>
|
||||
@if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35, 36, 37, 41]))
|
||||
@if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35, 36, 37, 41, 42]))
|
||||
<td>
|
||||
<div class="input-group">
|
||||
<select class="custom-select" name="draft_item[{{$booking_draft_item->id}}][adult]" id="draft_item_{{$booking_draft_item->id }}_adult">
|
||||
|
|
@ -183,8 +183,6 @@
|
|||
<td colspan="7">
|
||||
@endif
|
||||
{{ Form::textarea('draft_item['.$booking_draft_item->id.'][service]', $booking_draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control autoExpand', 'id'=>'draft_item_'.$booking_draft_item->id.'_service', 'rows'=>'1', 'data-min-rows'=>'1')) }}
|
||||
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<label class="custom-control custom-checkbox mt-2" style="margin-right: 20px;">
|
||||
|
|
|
|||
|
|
@ -64,6 +64,17 @@
|
|||
|
||||
<div class="tab-pane fade @if($step == 'contact') active show @endif" id="navs-contact">
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="form-label" for="contact_lands">Kontaktdaten aus folgenden Ländern nehmen</label>
|
||||
<select class="selectpicker" data-style="btn-default" name="contact_lands[]" multiple>
|
||||
{!! HTMLHelper::getTravelCountriesOptions($model->contact_lands) !!}
|
||||
</select>
|
||||
<em>Land/Länder müssen angeben sein, die Kontaktdaten des Landes (Reiselandes) werden nacheinander im PDF (RA, RB, Voucher) eingefügt.</em>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
<br>
|
||||
<h4>Kontaktdaten</h4>
|
||||
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th style="max-width: 60px;"> </th>
|
||||
<th style="width: 2%;">{{__('POS')}}</th>
|
||||
<th>{{__('Name')}}</th>
|
||||
<th>{{__('Farbe')}}</th>
|
||||
<th>{{__('sichtbar')}}</th>
|
||||
|
|
@ -93,12 +94,14 @@
|
|||
data-id="{{ $value->id }}"
|
||||
data-name="{{ $value->name }}"
|
||||
data-color="{{ $value->color }}"
|
||||
data-active="{{ $value->active }}">
|
||||
data-active="{{ $value->active }}"
|
||||
data-pos="{{ $value->pos }}">
|
||||
<span class="far fa-edit"></span>
|
||||
</button>
|
||||
</td>
|
||||
<td>{{ $value->name }}</td>
|
||||
<td>{{ $value->pos }}</td>
|
||||
|
||||
<td>{{ $value->name }}</td>
|
||||
<td>@if($value->color)
|
||||
<div style="display:inline-block; width: 20px; height: 20px; border: 1px solid #888a85; background-color: {{$value->color}}"></div>
|
||||
{{ $value->color }}
|
||||
|
|
@ -124,6 +127,7 @@
|
|||
data-id="new"
|
||||
data-name=""
|
||||
data-active="1"
|
||||
data-pos="0"
|
||||
|
||||
>Neuen Typ anlegen</button>
|
||||
</div>
|
||||
|
|
@ -147,6 +151,12 @@
|
|||
<input type="text" class="form-control" name="name" placeholder="{{__('Description')}}" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="pos" class="form-label">POS*</label>
|
||||
<input type="text" class="form-control" name="pos" placeholder="{{__('Position')}}" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
|
|
@ -155,8 +165,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="active" checked>
|
||||
|
|
@ -185,6 +193,7 @@
|
|||
var button = $(event.relatedTarget);
|
||||
$(this).find(".modal-content input[name='id']").val(button.data('id'));
|
||||
$(this).find(".modal-body input[name='name']").val(button.data('name'));
|
||||
$(this).find(".modal-body input[name='pos']").val(button.data('pos'));
|
||||
color = '#fff';
|
||||
if(button.data('color') != ""){
|
||||
color = button.data('color');
|
||||
|
|
@ -198,7 +207,7 @@
|
|||
$('.datatables-types').dataTable({
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 50,
|
||||
|
||||
"order": [[ 1, "desc" ]],
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
{!! '<a href="'.route('travel_user_detail', [$travel_user_booking_fewo->travel_user_id]) .'">'.$travel_user_booking_fewo->travel_user->first_name.' '.$travel_user_booking_fewo->travel_user->last_name.'</a>' !!}
|
||||
@endif</label>
|
||||
<select class="selectpicker" data-style="btn-light" name="travel_user_id" data-live-search="true" required>
|
||||
{!! HTMLHelper::getTravelUserOptions($travel_user_booking_fewo->travel_user_id) !!}
|
||||
{!! HTMLHelper::getTravelUserOptions($travel_user_booking_fewo->travel_user_id, "DESC") !!}
|
||||
</select>
|
||||
|
||||
|
||||
|
|
@ -213,28 +213,26 @@
|
|||
</div>
|
||||
</h4>
|
||||
@endif
|
||||
@if($travel_user_booking_fewo->isInvoice())
|
||||
@if($travel_user_booking_fewo->send_user_mail)
|
||||
<table class="table table-striped border-bottom mt-4">
|
||||
<tbody>
|
||||
@foreach($travel_user_booking_fewo->send_user_mail as $send_user_mail)
|
||||
<tr>
|
||||
<td style="width: 25%"><strong>{!! key($send_user_mail) !!}</strong><br>E-Mail versendet.</td>
|
||||
<td><span class="small">{!! nl2br(current($send_user_mail)) !!}</span></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@endif
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12 mt-2">
|
||||
{{ Form::textarea('send_mail_user_notice', '', ['placeholder'=>'Wichtige Hinweise in E-Mail, werden nur in die aktuelle E-Mail übernommen', 'class' => 'form-control autoExpand', 'rows'=>1]) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right mt-0">
|
||||
<button type="submit" name="action" value="sendMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('E-Mail Mietbestätigung an Mieter versenden?')}}');">{{ __('E-Mail mit Mietbestätigung / Rechnung und Mietbedingungen an Kunden versenden') }}</button>
|
||||
</div>
|
||||
@if($travel_user_booking_fewo->send_user_mail)
|
||||
<table class="table table-striped border-bottom mt-4">
|
||||
<tbody>
|
||||
@foreach($travel_user_booking_fewo->send_user_mail as $send_user_mail)
|
||||
<tr>
|
||||
<td style="width: 25%"><strong>{!! key($send_user_mail) !!}</strong><br>E-Mail versendet.</td>
|
||||
<td><span class="small">{!! nl2br(current($send_user_mail)) !!}</span></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@endif
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12 mt-2">
|
||||
{{ Form::textarea('send_mail_user_notice', '', ['placeholder'=>'Wichtige Hinweise in E-Mail, werden nur in die aktuelle E-Mail übernommen', 'class' => 'form-control autoExpand', 'rows'=>1]) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right mt-0">
|
||||
<button type="submit" name="action" value="sendMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('E-Mail Mietbestätigung an Mieter versenden?')}}');">{{ __('E-Mail mit Mietbestätigung / Rechnung und Mietbedingungen an Kunden versenden') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -258,36 +256,34 @@
|
|||
</div>
|
||||
</h4>
|
||||
@endif
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12">
|
||||
<button class="btn btn-default btn-sm " type="button" data-toggle="collapse" data-target="#collapseTravelInfo" aria-expanded="false" aria-controls="collapseTravelInfo">
|
||||
{{ __('Inhalt für das PDF / Mail') }} <i class="fa fa-angle-down"></i>
|
||||
</button>
|
||||
<div class="collapse mt-2" id="collapseTravelInfo">
|
||||
{{ Form::textarea('info_mail_text', $travel_user_booking_fewo->info_mail_text, ['class' => 'form-control autoExpand', 'rows'=>1, 'id'=>'travel_info_user_text']) }}
|
||||
<em>Grundtext in ADMIN CMS > <a href="{{route('cms_content_all')}}">Inhalte</a> > PDF Vorlage Anreiseinfo FeWo</em>
|
||||
<em class="small">(Änderungen werden hier gespeichert.)</em>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12">
|
||||
<button class="btn btn-default btn-sm " type="button" data-toggle="collapse" data-target="#collapseTravelInfo" aria-expanded="false" aria-controls="collapseTravelInfo">
|
||||
{{ __('Inhalt für das PDF / Mail') }} <i class="fa fa-angle-down"></i>
|
||||
</button>
|
||||
<div class="collapse mt-2" id="collapseTravelInfo">
|
||||
{{ Form::textarea('info_mail_text', $travel_user_booking_fewo->info_mail_text, ['class' => 'form-control autoExpand', 'rows'=>1, 'id'=>'travel_info_user_text']) }}
|
||||
<em>Grundtext in ADMIN CMS > <a href="{{route('cms_content_all')}}">Inhalte</a> > PDF Vorlage Anreiseinfo FeWo</em>
|
||||
<em class="small">(Änderungen werden hier gespeichert.)</em>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if($travel_user_booking_fewo->isTravelInfo())
|
||||
@if($travel_user_booking_fewo->send_info_mail)
|
||||
<table class="table table-striped border-bottom">
|
||||
<tbody>
|
||||
@foreach($travel_user_booking_fewo->send_info_mail as $send_info_mail)
|
||||
<tr>
|
||||
<td style="width: 25%"><strong>{!! key($send_info_mail) !!}</strong><br>E-Mail versendet.</td>
|
||||
<td><span class="small">{!! nl2br(current($send_info_mail)) !!}</span></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@endif
|
||||
<div class="text-right mt-0">
|
||||
<button type="submit" name="action" value="sendInfosMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Mail an Mieter versenden?')}}');">{{ __('E-Mail mit Anreiseinfo an Kunden versenden') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
@if($travel_user_booking_fewo->send_info_mail)
|
||||
<table class="table table-striped border-bottom">
|
||||
<tbody>
|
||||
@foreach($travel_user_booking_fewo->send_info_mail as $send_info_mail)
|
||||
<tr>
|
||||
<td style="width: 25%"><strong>{!! key($send_info_mail) !!}</strong><br>E-Mail versendet.</td>
|
||||
<td><span class="small">{!! nl2br(current($send_info_mail)) !!}</span></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@endif
|
||||
<div class="text-right mt-0">
|
||||
<button type="submit" name="action" value="sendInfosMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Mail an Mieter versenden?')}}');">{{ __('E-Mail mit Anreiseinfo an Kunden versenden') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
<th>{{__('vom')}}</th>
|
||||
<th>{{__('bis')}}</th>
|
||||
<th>{{__('Eingetragen')}}</th>
|
||||
<th>{{__('Mails')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('R.-Nr.')}}</th>
|
||||
|
|
@ -48,6 +49,7 @@
|
|||
{ data: 'from_date', name: 'from_date' },
|
||||
{ data: 'to_date', name: 'to_date' },
|
||||
{ data: 'is_calendar', name: 'is_calendar', orderable: false },
|
||||
{ data: 'is_mail', name: 'is_mail', orderable: false },
|
||||
{ data: 'status_name', name: 'status_name' },
|
||||
{ data: 'booking_date', name: 'booking_date' },
|
||||
{ data: 'invoice_number', name: 'invoice_number' },
|
||||
|
|
@ -88,6 +90,7 @@
|
|||
$('.selectpicker').selectpicker();
|
||||
}*/
|
||||
});
|
||||
$('#datatables-default').tooltip({selector: '[data-toggle="tooltip"]'});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
|
|||
BIN
storage/app/fewo/invoices/2019/9538.pdf
Normal file
BIN
storage/app/fewo/invoices/2019/9538.pdf
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue