Skip to content

F
fazo
Commit 6ca528e7 authored by Ruslan's avatar Ruslan
Browse files
Options

Init

parent 898273e7
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 96 deletions
.idea/workspace.xml
View file @ 6ca528e7
...@@ -2,16 +2,9 @@ ...@@ -2,16 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment=""> <list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/Http/Controllers/PackagesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user_new.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/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/profile/address_add.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/address_add.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$/resources/views/pages/profile/profile_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -39,9 +32,9 @@ ...@@ -39,9 +32,9 @@
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="css" value="5" /> <entry key="css" value="5" />
<entry key="env" value="1" /> <entry key="env" value="2" />
<entry key="ico" value="1" /> <entry key="ico" value="1" />
<entry key="php" value="134" /> <entry key="php" value="137" />
<entry key="png" value="4" /> <entry key="png" value="4" />
<entry key="svg" value="1" /> <entry key="svg" value="1" />
<entry key="woff2" value="1" /> <entry key="woff2" value="1" />
...@@ -49,7 +42,8 @@ ...@@ -49,7 +42,8 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="Blade" value="73" /> <entry key=".env file" value="1" />
<entry key="Blade" value="76" />
<entry key="CSS" value="5" /> <entry key="CSS" value="5" />
<entry key="Image" value="5" /> <entry key="Image" value="5" />
<entry key="PHP" value="61" /> <entry key="PHP" value="61" />
...@@ -61,12 +55,12 @@ ...@@ -61,12 +55,12 @@
<counts> <counts>
<entry key="css" value="14" /> <entry key="css" value="14" />
<entry key="env" value="15" /> <entry key="env" value="15" />
<entry key="php" value="17798" /> <entry key="php" value="17928" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Blade" value="11112" /> <entry key="Blade" value="11242" />
<entry key="CSS" value="14" /> <entry key="CSS" value="14" />
<entry key="PHP" value="6686" /> <entry key="PHP" value="6686" />
<entry key="PLAIN_TEXT" value="15" /> <entry key="PLAIN_TEXT" value="15" />
...@@ -77,39 +71,17 @@ ...@@ -77,39 +71,17 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
<caret line="44" column="43" selection-start-line="44" selection-start-column="43" selection-end-line="44" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Models/Address.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
<caret line="49" column="31" selection-start-line="49" selection-start-column="20" selection-end-line="49" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92"> <state relative-caret-position="345">
<caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="10" selection-end-column="14" /> <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="1495">
<caret line="75" column="34" selection-start-line="75" selection-start-column="34" selection-end-line="75" selection-end-column="34" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
...@@ -144,11 +116,29 @@ ...@@ -144,11 +116,29 @@
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="828"> <state relative-caret-position="276">
<caret line="45" column="58" selection-start-line="45" selection-start-column="58" selection-end-line="45" selection-end-column="58" /> <caret line="12" column="93" lean-forward="true" selection-start-line="12" selection-start-column="93" selection-end-line="12" selection-end-column="93" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_menu.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="115">
<caret line="5" column="38" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -255,6 +245,7 @@ ...@@ -255,6 +245,7 @@
<option value="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
</list> </list>
</option> </option>
...@@ -368,10 +359,10 @@ ...@@ -368,10 +359,10 @@
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-10" /> <option name="x" value="2239" />
<option name="y" value="-10" /> <option name="y" value="318" />
<option name="width" value="1940" /> <option name="width" value="948" />
<option name="height" value="1050" /> <option name="height" value="838" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -534,17 +525,17 @@ ...@@ -534,17 +525,17 @@
<workItem from="1560524548209" duration="1799000" /> <workItem from="1560524548209" duration="1799000" />
<workItem from="1560527178382" duration="8153000" /> <workItem from="1560527178382" duration="8153000" />
<workItem from="1560763340093" duration="125000" /> <workItem from="1560763340093" duration="125000" />
<workItem from="1561443616644" duration="593000" /> <workItem from="1561443616644" duration="3448000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="126469000" /> <option name="totallyTimeSpent" value="129324000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <frame x="1912" y="-8" width="1936" height="1176" extended-state="6" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23355705" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18550107" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -557,7 +548,7 @@ ...@@ -557,7 +548,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" /> <window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.28368795" /> <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.19193858" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.2776204" /> <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.2776204" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -621,20 +612,6 @@ ...@@ -621,20 +612,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/Models/Feedback.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/feedback/view.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/admin/feedback/view.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="901"> <state relative-caret-position="901">
...@@ -747,13 +724,6 @@ ...@@ -747,13 +724,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_menu.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_layout.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_layout.blade.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -914,13 +884,6 @@ ...@@ -914,13 +884,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1495">
<caret line="75" column="34" selection-start-line="75" selection-start-column="34" selection-end-line="75" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php"> <entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="966"> <state relative-caret-position="966">
...@@ -942,6 +905,13 @@ ...@@ -942,6 +905,13 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_menu.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -952,12 +922,29 @@ ...@@ -952,12 +922,29 @@
</state> </state>
</provider> </provider>
</entry> </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="115">
<caret line="5" column="38" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="828"> <state relative-caret-position="276">
<caret line="45" column="58" selection-start-line="45" selection-start-column="58" selection-end-line="45" selection-end-column="58" /> <caret line="12" column="93" lean-forward="true" selection-start-line="12" selection-start-column="93" selection-end-line="12" selection-end-column="93" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
resources/views/pages/parcels/index.blade.php
View file @ 6ca528e7
...@@ -10,19 +10,7 @@ ...@@ -10,19 +10,7 @@
</div> </div>
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
<div class="row"> @include('pages.pages.parcels.package_menu', ['countPackages' => $countPackages])
<div class="col-12">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-selected="true">Ожидаются <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="false">На складе <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные <span class="badge badge-pill badge-primary">0</span></a>
</div>
</nav>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="table-responsive"> <div class="table-responsive">
......
resources/views/pages/parcels/package_menu.blade.php 0 → 100644
View file @ 6ca528e7
<div class="row">
<div class="col-12">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-selected="true"> Ожидаются
@if($countPackages['onPending'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['onPending'] }}</span>
@endif
</a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="false">На складе
@if($countPackages['inStore'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['inStore'] }}</span>
@endif
</a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке
@if($countPackages['onPacking'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['onPacking'] }}</span>
@endif
</a>
<a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные
@if($countPackages['sent'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['sent'] }}</span>
@endif
</a>
<a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные <span class="badge badge-pill badge-primary">0</span></a>
</div>
</nav>
</div>
</div>
\ No newline at end of file
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