On master: Tower Auto-Stash: 2018-08-20 16:28:19 +0200
This commit is contained in:
Kevin Adametz
commit
b1986c53d0
1 changed files with 57 additions and 76 deletions
133
trunk/.idea/workspace.xml
generated
133
trunk/.idea/workspace.xml
generated
|
|
@ -2,6 +2,7 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="6bca430c-9994-40e0-bbe0-86a604f76b49" name="Default" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/AppBundle/Controller/BookingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/AppBundle/Controller/BookingController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/AppBundle/Entity/TravelDate.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/AppBundle/Entity/TravelDate.php" afterDir="false" />
|
||||
</list>
|
||||
|
|
@ -82,17 +83,16 @@
|
|||
<file leaf-file-name="BookingController.php" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/BookingController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2954">
|
||||
<caret line="613" column="42" lean-forward="true" selection-start-line="613" selection-start-column="42" selection-end-line="613" selection-end-column="42" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="TravelPeriodDate.php" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelPeriodDate.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="223">
|
||||
<caret line="109" column="31" selection-start-line="109" selection-start-column="31" selection-end-line="109" selection-end-column="31" />
|
||||
<state relative-caret-position="132">
|
||||
<caret line="464" column="83" selection-start-line="464" selection-start-column="83" selection-end-line="464" selection-end-column="83" />
|
||||
<folding>
|
||||
<element signature="e#6915#6960#0#PHP" expanded="true" />
|
||||
<element signature="e#8150#8183#0#PHP" expanded="true" />
|
||||
<element signature="e#9281#9308#1#PHP" expanded="true" />
|
||||
<element signature="e#9483#9529#0#PHP" expanded="true" />
|
||||
<element signature="e#24238#24270#1#PHP" expanded="true" />
|
||||
<element signature="e#24480#24512#1#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -100,26 +100,8 @@
|
|||
<file leaf-file-name="TravelDate.php" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelDate.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="821">
|
||||
<caret line="289" column="131" selection-start-line="289" selection-start-column="131" selection-end-line="289" selection-end-column="131" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="TravelPeriodPriceType.php" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelPeriodPriceType.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="3234">
|
||||
<caret line="231" selection-start-line="231" selection-end-line="231" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="TravelPeriodPrice.php" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelPeriodPrice.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2723">
|
||||
<caret line="330" column="9" selection-start-line="330" selection-start-column="9" selection-end-line="330" selection-end-column="9" />
|
||||
<state relative-caret-position="545">
|
||||
<caret line="296" column="36" selection-start-line="296" selection-start-column="36" selection-end-line="296" selection-end-column="36" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -127,17 +109,8 @@
|
|||
<file leaf-file-name="SternToursCrmExporter.php" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Export/SternToursCrmExporter.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="140">
|
||||
<caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="BookingSternToursCrmExporter.php" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Export/BookingSternToursCrmExporter.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="588">
|
||||
<caret line="49" selection-start-line="49" selection-end-line="49" />
|
||||
<state relative-caret-position="196">
|
||||
<caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -344,9 +317,9 @@
|
|||
</component>
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="14" />
|
||||
<option name="y" value="23" />
|
||||
<option name="y" value="244" />
|
||||
<option name="width" value="2546" />
|
||||
<option name="height" value="1417" />
|
||||
<option name="height" value="1196" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectView">
|
||||
|
|
@ -664,15 +637,15 @@
|
|||
<workItem from="1534416730210" duration="8699000" />
|
||||
<workItem from="1534490639805" duration="24151000" />
|
||||
<workItem from="1534760761184" duration="4999000" />
|
||||
<workItem from="1534773548125" duration="1133000" />
|
||||
<workItem from="1534773548125" duration="1619000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="126693000" />
|
||||
<option name="totallyTimeSpent" value="127179000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="14" y="23" width="2546" height="1417" extended-state="0" />
|
||||
<frame x="14" y="244" width="2546" height="1196" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1753195" />
|
||||
|
|
@ -977,33 +950,9 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelBooking.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Resources/views/default/email/bookingServiceEmail.txt.twig">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Export/BookingSternToursCrmExporter.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="588">
|
||||
<caret line="49" selection-start-line="49" selection-end-line="49" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Export/SternToursCrmExporter.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="140">
|
||||
<caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelPeriodPrice.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2723">
|
||||
<caret line="330" column="9" selection-start-line="330" selection-start-column="9" selection-end-line="330" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelPeriodPriceType.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="3234">
|
||||
|
|
@ -1018,17 +967,49 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelDate.php">
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Export/BookingSternToursCrmExporter.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="821">
|
||||
<caret line="289" column="131" selection-start-line="289" selection-start-column="131" selection-end-line="289" selection-end-column="131" />
|
||||
<state relative-caret-position="561">
|
||||
<caret line="49" selection-start-line="49" selection-end-line="49" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelPeriodPrice.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2723">
|
||||
<caret line="330" column="9" selection-start-line="330" selection-start-column="9" selection-end-line="330" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelDate.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="545">
|
||||
<caret line="296" column="36" selection-start-line="296" selection-start-column="36" selection-end-line="296" selection-end-column="36" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Export/SternToursCrmExporter.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="196">
|
||||
<caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/TravelBooking.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/BookingController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2954">
|
||||
<caret line="613" column="42" lean-forward="true" selection-start-line="613" selection-start-column="42" selection-end-line="613" selection-end-column="42" />
|
||||
<state relative-caret-position="132">
|
||||
<caret line="464" column="83" selection-start-line="464" selection-start-column="83" selection-end-line="464" selection-end-column="83" />
|
||||
<folding>
|
||||
<element signature="e#6915#6960#0#PHP" expanded="true" />
|
||||
<element signature="e#8150#8183#0#PHP" expanded="true" />
|
||||
<element signature="e#9281#9308#1#PHP" expanded="true" />
|
||||
<element signature="e#9483#9529#0#PHP" expanded="true" />
|
||||
<element signature="e#24238#24270#1#PHP" expanded="true" />
|
||||
<element signature="e#24480#24512#1#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue