Skip to content

F
fazo
Commit 540090b4 authored by Ruslan's avatar Ruslan
Browse files
Options

Stage 1.1.1

parent 58331217
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 124 deletions
.idea/workspace.xml
View file @ 540090b4
......@@ -2,19 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/packages_onpacking.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/packages_sent.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/status_description.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/packages/declaration_script.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/packages/declaration_script.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/parcels/declaration_modal.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -43,6 +31,7 @@
<counts>
<entry key="css" value="5" />
<entry key="env" value="2" />
<entry key="gitignore" value="1" />
<entry key="ico" value="1" />
<entry key="php" value="152" />
<entry key="png" value="4" />
......@@ -57,7 +46,7 @@
<entry key="CSS" value="5" />
<entry key="Image" value="5" />
<entry key="PHP" value="63" />
<entry key="PLAIN_TEXT" value="2" />
<entry key="PLAIN_TEXT" value="3" />
<entry key="SVG" value="1" />
</counts>
</usages-collector>
......@@ -65,13 +54,13 @@
<counts>
<entry key="css" value="14" />
<entry key="env" value="28" />
<entry key="php" value="18595" />
<entry key="php" value="18596" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key=".env file" value="13" />
<entry key="Blade" value="11776" />
<entry key="Blade" value="11777" />
<entry key="CSS" value="14" />
<entry key="PHP" value="6819" />
<entry key="PLAIN_TEXT" value="15" />
......@@ -81,20 +70,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="64" column="4" lean-forward="true" selection-start-line="64" selection-start-column="4" selection-end-line="64" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
<state relative-caret-position="299">
<caret line="37" column="72" lean-forward="true" selection-start-line="37" selection-start-column="72" selection-end-line="37" selection-end-column="72" />
</state>
</provider>
</entry>
......@@ -117,11 +97,20 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/declaration_modal.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
<state relative-caret-position="-72">
<caret column="17" selection-start-column="17" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
......@@ -382,9 +371,9 @@
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="232" />
<option name="y" value="151" />
<option name="width" value="1185" />
<option name="x" value="-9" />
<option name="y" value="-9" />
<option name="width" value="1938" />
<option name="height" value="1048" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
......@@ -402,46 +391,6 @@
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Http" type="462c0819:PsiDirectoryNode" />
<item name="Controllers" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="Models" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
......@@ -453,27 +402,12 @@
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="packages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
......@@ -483,19 +417,6 @@
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="parcels" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="profile" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="routes" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -510,13 +431,14 @@
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
......@@ -548,12 +470,12 @@
<workItem from="1560524548209" duration="1799000" />
<workItem from="1560527178382" duration="8153000" />
<workItem from="1560763340093" duration="125000" />
<workItem from="1561443616644" duration="13583000" />
<workItem from="1561443616644" duration="13908000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="139459000" />
<option name="totallyTimeSpent" value="139784000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
......@@ -636,11 +558,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app2.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-810" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/templates/declaration.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3485">
......@@ -923,13 +840,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="64" column="4" lean-forward="true" selection-start-line="64" selection-start-column="4" selection-end-line="64" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213">
......@@ -974,8 +884,22 @@
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/declaration_modal.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
<state relative-caret-position="-72">
<caret column="17" selection-start-column="17" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="37" column="72" lean-forward="true" selection-start-line="37" selection-start-column="72" selection-end-line="37" selection-end-column="72" />
</state>
</provider>
</entry>
......
resources/views/pages/parcels/index.blade.php
View file @ 540090b4
......@@ -35,7 +35,7 @@
<td class="text-center"><input type="checkbox" name="packages2pack[]" value="{{ $package->id }}"> </td>
<td class="text-center">{{ $package->package_number() }}</td>
<td class="text-center"><span class="badge badge-primary">{{ \App\Models\Package::$statuses_descr[$package->status] }}</span></td>
<td><a href="#" class="text-info"> {{ $package->track_number }} </a></td>
<td><a href="https://www.packagetrackr.com/track/{{ $package->track_number }}" class="text-info"> {{ $package->track_number }} </a></td>
<td class="d-flex justify-content-between align-items-center">
<span class="badge badge-primary badge-pill">{{ $package->total_items() }}</span>
<a href="#" onclick="showModal({{ $package->id }})">Декларация</a>
......
resources/views/pages/parcels/packages_inwarehouse.blade.php
View file @ 540090b4
......@@ -39,7 +39,7 @@
<td class="text-center"><input type="checkbox" name="packages2pack[]" value="{{ $package->id }}"> </td>
<td class="text-center">{{ $package->package_number() }}</td>
<td class="text-center"><span class="badge badge-primary">{{ \App\Models\Package::$statuses_descr[$package->status] }}</span></td>
<td><a href="#" class="text-info"> {{ $package->track_number }} </a></td>
<td><a href="https://www.packagetrackr.com/track/{{ $package->track_number }}" class="text-info"> {{ $package->track_number }} </a></td>
<td class="d-flex justify-content-between align-items-center">
<span class="badge badge-primary badge-pill">{{ $package->total_items() }}</span>
<a href="#" onclick="showModal({{ $package->id }})">Декларация</a>
......
resources/views/pages/parcels/packages_onpacking.blade.php
View file @ 540090b4
......@@ -35,7 +35,7 @@
<td class="text-center"><input type="checkbox" name="packages2pack[]" value="{{ $package->id }}"> </td>
<td class="text-center">{{ $package->package_number() }}</td>
<td class="text-center"><span class="badge badge-primary">{{ \App\Models\Package::$statuses_descr[$package->status] }}</span></td>
<td><a href="#" class="text-info"> {{ $package->track_number }} </a></td>
<td><a href="https://www.packagetrackr.com/track/{{ $package->track_number }}" class="text-info"> {{ $package->track_number }} </a></td>
<td class="d-flex justify-content-between align-items-center">
<span class="badge badge-primary badge-pill">{{ $package->total_items() }}</span>
<a href="#" onclick="showModal({{ $package->id }})">Декларация</a>
......
resources/views/pages/parcels/packages_sent.blade.php
View file @ 540090b4
......@@ -35,7 +35,7 @@
<td class="text-center"><input type="checkbox" name="packages2pack[]" value="{{ $package->id }}"> </td>
<td class="text-center">{{ $package->package_number() }}</td>
<td class="text-center"><span class="badge badge-primary">{{ \App\Models\Package::$statuses_descr[$package->status] }}</span></td>
<td><a href="#" class="text-info"> {{ $package->track_number }} </a></td>
<td><a href="https://www.packagetrackr.com/track/{{ $package->track_number }}" class="text-info"> {{ $package->track_number }} </a></td>
<td class="d-flex justify-content-between align-items-center">
<span class="badge badge-primary badge-pill">{{ $package->total_items() }}</span>
<a href="#" onclick="showModal({{ $package->id }})">Декларация</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment