Skip to content

F
fazo
Commit 762da84f authored by Ruslan's avatar Ruslan
Browse files
Options

Stage 1.1

parent 6ca528e7
Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 233 deletions
.env
View file @ 762da84f
...@@ -7,11 +7,11 @@ APP_URL=http://localhost ...@@ -7,11 +7,11 @@ APP_URL=http://localhost
LOG_CHANNEL=stack LOG_CHANNEL=stack
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=nobletech.co DB_HOST=127.0.0.1
DB_PORT=3306 DB_PORT=3306
DB_DATABASE=fazo DB_DATABASE=fazo
DB_USERNAME=iego DB_USERNAME=root
DB_PASSWORD=3448844 DB_PASSWORD=
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=file CACHE_DRIVER=file
......
.idea/workspace.xml
View file @ 762da84f
...@@ -2,9 +2,19 @@ ...@@ -2,9 +2,19 @@
<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/package_menu.blade.php" afterDir="false" /> <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$/.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/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> </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" />
...@@ -34,7 +44,7 @@ ...@@ -34,7 +44,7 @@
<entry key="css" value="5" /> <entry key="css" value="5" />
<entry key="env" value="2" /> <entry key="env" value="2" />
<entry key="ico" value="1" /> <entry key="ico" value="1" />
<entry key="php" value="137" /> <entry key="php" value="152" />
<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" />
...@@ -43,10 +53,10 @@ ...@@ -43,10 +53,10 @@
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key=".env file" value="1" /> <entry key=".env file" value="1" />
<entry key="Blade" value="76" /> <entry key="Blade" value="89" />
<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="63" />
<entry key="PLAIN_TEXT" value="2" /> <entry key="PLAIN_TEXT" value="2" />
<entry key="SVG" value="1" /> <entry key="SVG" value="1" />
</counts> </counts>
...@@ -54,15 +64,16 @@ ...@@ -54,15 +64,16 @@
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="css" value="14" /> <entry key="css" value="14" />
<entry key="env" value="15" /> <entry key="env" value="28" />
<entry key="php" value="17928" /> <entry key="php" value="18595" />
</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="11242" /> <entry key=".env file" value="13" />
<entry key="Blade" value="11776" />
<entry key="CSS" value="14" /> <entry key="CSS" value="14" />
<entry key="PHP" value="6686" /> <entry key="PHP" value="6819" />
<entry key="PLAIN_TEXT" value="15" /> <entry key="PLAIN_TEXT" value="15" />
</counts> </counts>
</usages-collector> </usages-collector>
...@@ -71,83 +82,91 @@ ...@@ -71,83 +82,91 @@
<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$/app/Http/Controllers/PackagesController.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="345"> <state relative-caret-position="368">
<caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" /> <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> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor" /> <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>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/web.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_sent.blade.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="115">
<caret line="51" column="31" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="31" /> <caret line="5" column="21" lean-forward="true" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.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">
<state relative-caret-position="437"> <state relative-caret-position="529">
<caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="56" selection-end-column="23" /> <caret line="23" column="10" lean-forward="true" selection-start-line="6" selection-start-column="4" selection-end-line="23" selection-end-column="10" />
</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$/resources/views/pages/packages/packages_pending.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/declaration_modal.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299"> <state>
<caret line="13" column="61" selection-start-line="13" selection-start-column="61" selection-end-line="13" selection-end-column="61" /> <caret column="26" selection-start-column="26" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/declaration_script.blade.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="4" column="91" selection-start-line="4" selection-start-column="91" selection-end-line="4" selection-end-column="91" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <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/package_menu.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="213">
<caret line="12" column="93" lean-forward="true" selection-start-line="12" selection-start-column="93" selection-end-line="12" selection-end-column="93" /> <caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_menu.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_onpacking.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644"> <state relative-caret-position="23">
<caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" /> <caret line="1" selection-start-line="1" selection-end-line="3" selection-end-column="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115"> <state relative-caret-position="305">
<caret line="5" column="38" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="38" /> <caret line="68" column="47" selection-start-line="68" selection-start-column="47" selection-end-line="68" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/status_description.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1357"> <state relative-caret-position="138">
<caret line="59" column="41" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" /> <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -156,12 +175,6 @@ ...@@ -156,12 +175,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>Dashboard</find>
<find>David</find>
<find>logo</find>
<find>providers</find>
<find>logo-</find>
<find>Клиент</find>
<find>Hello, A</find> <find>Hello, A</find>
<find>activi</find> <find>activi</find>
<find>ip</find> <find>ip</find>
...@@ -186,6 +199,12 @@ ...@@ -186,6 +199,12 @@
<find>address</find> <find>address</find>
<find>device</find> <find>device</find>
<find>pending_packages</find> <find>pending_packages</find>
<find>packages</find>
<find>/packages</find>
<find>parce</find>
<find>onpa</find>
<find>countPackages</find>
<find>sen</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -200,10 +219,8 @@ ...@@ -200,10 +219,8 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/resources/views/pages/admin/packages_list.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/admin/packages_list.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/admin/address/address_list.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/admin/address/address_list.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/packages/declaration_script.blade.php" />
<option value="$PROJECT_DIR$/config/app.php" /> <option value="$PROJECT_DIR$/config/app.php" />
<option value="$PROJECT_DIR$/resources/views/templates/declaration.blade.php" /> <option value="$PROJECT_DIR$/resources/views/templates/declaration.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/admin/declarations/index.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/admin/declarations/index.blade.php" />
...@@ -229,7 +246,6 @@ ...@@ -229,7 +246,6 @@
<option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" />
<option value="$PROJECT_DIR$/resources/views/about.blade.php" /> <option value="$PROJECT_DIR$/resources/views/about.blade.php" />
<option value="$PROJECT_DIR$/resources/views/contacts.blade.php" /> <option value="$PROJECT_DIR$/resources/views/contacts.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/public/css/style.css" /> <option value="$PROJECT_DIR$/public/css/style.css" />
<option value="$PROJECT_DIR$/public/frontend/css/style.css" /> <option value="$PROJECT_DIR$/public/frontend/css/style.css" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
...@@ -242,11 +258,18 @@ ...@@ -242,11 +258,18 @@
<option value="$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" />
<option value="$PROJECT_DIR$/.env" />
<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$/routes/web.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/package_menu.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/status_description.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" /> <option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_onpacking.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_sent.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/packages/declaration_script.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/declaration_modal.blade.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -359,10 +382,10 @@ ...@@ -359,10 +382,10 @@
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2239" /> <option name="x" value="232" />
<option name="y" value="318" /> <option name="y" value="151" />
<option name="width" value="948" /> <option name="width" value="1185" />
<option name="height" value="838" /> <option name="height" value="1048" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -525,17 +548,18 @@ ...@@ -525,17 +548,18 @@
<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="3448000" /> <workItem from="1561443616644" duration="13583000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="129324000" /> <option name="totallyTimeSpent" value="139459000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1176" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18550107" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23355705" />
<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" />
...@@ -548,7 +572,7 @@ ...@@ -548,7 +572,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.19193858" /> <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.28368795" />
<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" />
...@@ -612,37 +636,6 @@ ...@@ -612,37 +636,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/feedback/view.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="901">
<caret line="53" column="11" selection-start-line="53" selection-start-column="11" selection-end-line="53" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/feedback/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="4" selection-start-line="15" selection-start-column="4" selection-end-line="18" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Activity.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="26" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2271">
<caret line="94" column="107" selection-start-line="94" selection-start-column="107" selection-end-line="94" selection-end-column="107" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app2.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/app2.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-810" /> <state relative-caret-position="-810" />
...@@ -682,13 +675,6 @@ ...@@ -682,13 +675,6 @@
<entry file="file://$PROJECT_DIR$/public/frontend/fonts/fontawesome-webfont.woff2"> <entry file="file://$PROJECT_DIR$/public/frontend/fonts/fontawesome-webfont.woff2">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486">
<caret line="33" column="53" selection-start-line="33" selection-start-column="53" selection-end-line="33" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/about.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
...@@ -710,13 +696,6 @@ ...@@ -710,13 +696,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Models/Package.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="51" column="31" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112"> <state relative-caret-position="112">
...@@ -724,16 +703,6 @@ ...@@ -724,16 +703,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_layout.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/declaration_script.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/Core/Core_c.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/Core/Core_c.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175"> <state relative-caret-position="175">
...@@ -846,16 +815,6 @@ ...@@ -846,16 +815,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="45" column="9" lean-forward="true" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260"> <state relative-caret-position="260">
...@@ -863,13 +822,6 @@ ...@@ -863,13 +822,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.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>
<entry file="file://$PROJECT_DIR$/app/Models/Address.php"> <entry file="file://$PROJECT_DIR$/app/Models/Address.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012"> <state relative-caret-position="1012">
...@@ -884,67 +836,148 @@ ...@@ -884,67 +836,148 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/routes/web.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_pending.blade.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="299">
<caret line="51" column="31" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="31" /> <caret line="13" column="61" selection-start-line="13" selection-start-column="61" selection-end-line="13" selection-end-column="61" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_menu.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437"> <state relative-caret-position="644">
<caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="56" selection-end-column="23" /> <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_pending.blade.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="299"> <state relative-caret-position="299">
<caret line="13" column="61" selection-start-line="13" selection-start-column="61" selection-end-line="13" selection-end-column="61" /> <caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_menu.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/admin/packages/packages_list.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644"> <state relative-caret-position="506">
<caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" /> <caret line="37" column="203" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="203" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="564">
<caret line="33" column="53" selection-start-line="33" selection-start-column="53" selection-end-line="33" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="24" column="39" selection-start-line="24" selection-start-column="39" selection-end-line="24" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="56" column="83" selection-start-line="56" selection-start-column="72" selection-end-line="56" selection-end-column="83" />
</state> </state>
</provider> </provider>
</entry> </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>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="104" column="34" selection-start-line="104" selection-start-column="34" selection-end-line="104" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Package.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="38" column="42" selection-start-line="38" selection-start-column="35" selection-end-line="38" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="1" selection-start-line="1" selection-end-line="3" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1357"> <state relative-caret-position="305">
<caret line="59" column="41" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" /> <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/package_layout.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="23" column="10" lean-forward="true" selection-start-line="6" selection-start-column="4" selection-end-line="23" selection-end-column="10" />
</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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/package_menu.blade.php"> <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">
<caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="68" column="47" selection-start-line="68" selection-start-column="47" selection-end-line="68" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_onpacking.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="1" selection-start-line="1" selection-end-line="3" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_sent.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115"> <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" /> <caret line="5" column="21" lean-forward="true" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/status_description.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="138">
<caret line="12" column="93" lean-forward="true" selection-start-line="12" selection-start-column="93" selection-end-line="12" selection-end-column="93" /> <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/declaration_script.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <state relative-caret-position="92">
<caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" /> <caret line="4" column="91" selection-start-line="4" selection-start-column="91" selection-end-line="4" selection-end-column="91" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/declaration_modal.blade.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
</state>
</provider>
</entry> </entry>
</component> </component>
</project> </project>
\ No newline at end of file
app/Http/Controllers/PackagesController.php
View file @ 762da84f
...@@ -88,7 +88,7 @@ class PackagesController extends Controller ...@@ -88,7 +88,7 @@ class PackagesController extends Controller
public function onpacking_packages() public function onpacking_packages()
{ {
$packages = Package::where('user_id', Auth::id())->where('status', 'onpacking')->orderBy('id', 'desc')->get(); $packages = Package::where('user_id', Auth::id())->where('status', 'onpacking')->orderBy('id', 'desc')->get();
return view('pages.packages.packages_onpacking', [ return view('pages.parcels.packages_onpacking', [
'packages' => $packages, 'packages' => $packages,
'jsonStructure' => $this->makeDeclarationJSON($packages), 'jsonStructure' => $this->makeDeclarationJSON($packages),
'countPackages' => $this->countPackages(), 'countPackages' => $this->countPackages(),
...@@ -102,7 +102,7 @@ class PackagesController extends Controller ...@@ -102,7 +102,7 @@ class PackagesController extends Controller
public function sent_packages() public function sent_packages()
{ {
$packages = Package::where('user_id', Auth::id())->where('status', 'sent')->orderBy('id', 'desc')->get(); $packages = Package::where('user_id', Auth::id())->where('status', 'sent')->orderBy('id', 'desc')->get();
return view('pages.packages.packages_sent', [ return view('pages.parcels.packages_sent', [
'packages' => $packages, 'packages' => $packages,
'jsonStructure' => $this->makeDeclarationJSON($packages), 'jsonStructure' => $this->makeDeclarationJSON($packages),
'countPackages' => $this->countPackages(), 'countPackages' => $this->countPackages(),
......
resources/views/pages/packages/declaration_script.blade.php
View file @ 762da84f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
var packagesDeclaration = {!! $jsonStructure !!}; var packagesDeclaration = {!! $jsonStructure !!};
function showModal(id) { function showModal(id) {
var table = '<table class="table table-bordered"><thead><tr><th>Название</th><th>Количество</th><th>Цена</th><th>Вес</th></thead><tbody>'; var table = '<table class="table table-bordered table-sm"><thead class="thead-light"><tr><th>Название</th><th>Количество</th><th>Цена</th><th>Вес</th></thead><tbody>';
for (i in packagesDeclaration[id]) { for (i in packagesDeclaration[id]) {
table += '<tr><td>' + packagesDeclaration[id][i].name + '</td><td>' table += '<tr><td>' + packagesDeclaration[id][i].name + '</td><td>'
+ packagesDeclaration[id][i].amount + '</td><td> $' + packagesDeclaration[id][i].price + '</td><td>' + packagesDeclaration[id][i].amount + '</td><td> $' + packagesDeclaration[id][i].price + '</td><td>'
......
resources/views/pages/parcels/declaration_modal.blade.php 0 → 100644
View file @ 762da84f
<div class="modal" tabindex="-1" id="declarationModal" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Декларация</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Декларация пуста</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Закрыть</button>
</div>
</div>
</div>
</div>
\ No newline at end of file
resources/views/pages/parcels/index.blade.php
View file @ 762da84f
@extends('layouts.user_new') @extends('layouts.user_new')
@section('custom_script')
@include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
@endsection
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
...@@ -10,50 +12,55 @@ ...@@ -10,50 +12,55 @@
</div> </div>
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
@include('pages.pages.parcels.package_menu', ['countPackages' => $countPackages]) @include('pages.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_PENDING])
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover bg-white border-1 shadow-sm"> <table class="table table-hover bg-white shadow-sm table-bordered">
<thead> <thead class="thead-light">
<tr> <tr>
<th>Tracking ID</th> <th>-</th>
<th>Название</th> <th>№</th>
<th>Статус</th> <th>Статус</th>
<th>Трек №</th>
<th>Количество товаров</th>
<th>Стоимость товаров</th>
<th>Вес</th> <th>Вес</th>
<th>Количество</th> <th>Стоимость доставки</th>
<th>Общая стоимость</th>
<th>Manage</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($packages as $unit) @foreach($packages as $package)
<tr> <tr>
<td>{{ $unit->track_number }}</td> <td class="text-center"><input type="checkbox" name="packages2pack[]" value="{{ $package->id }}"> </td>
<td><a href="#">{{ $unit->package_name }}</a></td> <td class="text-center">{{ $package->package_number() }}</td>
<td><b>{{ $unit->status }}</b></td> <td class="text-center"><span class="badge badge-primary">{{ \App\Models\Package::$statuses_descr[$package->status] }}</span></td>
<td>{{ $unit->items_weight() }}</td> <td><a href="#" class="text-info"> {{ $package->track_number }} </a></td>
<td>{{ $unit->total_items() }}</td> <td class="d-flex justify-content-between align-items-center">
<td>${{ $unit->items_cost() }}</td> <span class="badge badge-primary badge-pill">{{ $package->total_items() }}</span>
<td> <a href="#" onclick="showModal({{ $package->id }})">Декларация</a>
@if($unit->status == 1)
<span class="icon icon-xs fa fa-money"></span>
@endif
<span class="icon icon-xs fa fa-pencil"></span>
<span class="icon icon-xs fa fa-times-circle"></span>
</td> </td>
<td class="text-center">${{ $package->items_cost() }}</td>
<td class="text-center">{{ $package->items_weight() }} кг</td>
<td class="text-center">{{ $package->delivery_cost }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</table>
</div> </div>
<!-- RD Mailform--> <!-- RD Mailform-->
<a href="/packages/addr" class="btn btn-primary shadow" >Добавить посылку</a> <a href="/packages/addr" class="btn btn-success shadow" >Добавить посылку</a>
</div>
</div>
<div class="row mt-5">
<div class="col-12">
@include('pages.parcels.status_description')
</div> </div>
</div> </div>
</div> </div>
</section> </section>
@include('pages.parcels.declaration_modal')
@endsection @endsection
resources/views/pages/parcels/package_menu.blade.php
View file @ 762da84f
...@@ -2,27 +2,31 @@ ...@@ -2,27 +2,31 @@
<div class="col-12"> <div class="col-12">
<nav> <nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist"> <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"> Ожидаются <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_PENDING ? 'active' : '' }}" href="{{ route('packagePending') }}"> Ожидаются
@if($countPackages['onPending'] !== 0) @if($countPackages['onPending'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['onPending'] }}</span> <span class="badge badge-pill badge-primary">{{ $countPackages['onPending'] }}</span>
@endif @endif
</a> </a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="false">На складе <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_INSTORE ? 'active' : '' }}" href="{{ route('packageInwarehouse') }}">На складе
@if($countPackages['inStore'] !== 0) @if($countPackages['inStore'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['inStore'] }}</span> <span class="badge badge-pill badge-primary">{{ $countPackages['inStore'] }}</span>
@endif @endif
</a> </a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_ONPACKING ? 'active' : '' }}" href="{{ route('packagePacking') }}">На упаковке
@if($countPackages['onPacking'] !== 0) @if($countPackages['onPacking'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['onPacking'] }}</span> <span class="badge badge-pill badge-primary">{{ $countPackages['onPacking'] }}</span>
@endif @endif
</a> </a>
<a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные <a class="nav-item nav-link {{ $active == \App\Models\Package::STATUS_SENT ? 'active' : '' }}" href="{{ route('packageSent') }}">Отправленные
@if($countPackages['sent'] !== 0) @if($countPackages['sent'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['sent'] }}</span> <span class="badge badge-pill badge-primary">{{ $countPackages['sent'] }}</span>
@endif @endif
</a> </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> <a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные
@if($countPackages['delivered'] !== 0)
<span class="badge badge-pill badge-primary">{{ $countPackages['delivered'] }}</span>
@endif
</a>
</div> </div>
</nav> </nav>
</div> </div>
......
resources/views/pages/parcels/packages_inwarehouse.blade.php
View file @ 762da84f
@extends('layouts.user_new') @extends('layouts.user_new')
@section('custom_script')
@include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
@endsection
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
...@@ -10,19 +12,7 @@ ...@@ -10,19 +12,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.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_INSTORE])
<div class="col-12">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-selected="false">Ожидаются <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link active" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="true">На складе <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">
...@@ -30,8 +20,8 @@ ...@@ -30,8 +20,8 @@
{{ csrf_field() }} {{ csrf_field() }}
<table class="table table-light table-hover table-bordered table-sm"> <table class="table table-hover bg-white shadow-sm table-bordered">
<thead class=""> <thead class="thead-light">
<tr> <tr>
<th>-</th> <th>-</th>
<th>№</th> <th>№</th>
...@@ -62,22 +52,19 @@ ...@@ -62,22 +52,19 @@
</tbody> </tbody>
</table> </table>
<input type="submit" class="btn btn-success mb-5 mt-4" value="Отправить на упаковку" /> <input type="submit" class="btn btn-success shadow mb-5 mt-4" value="Отправить на упаковку" />
</form> </form>
</div> </div>
<!-- RD Mailform--> <!-- RD Mailform-->
<h5>Обозначение статусов:</h5>
<ul>
<li>Ожидаются - Посылка создана в системе, но еще не дошла до нашего склада.</li>
<li>На складе - Посылка находится на складе в Нью-Йорке.</li>
<li>На упаковке - Посылка проходит процесс упаковки и отправки.</li>
<li>Отправленные - Посылка находится в пути.</li>
<li>Доставленные - Посылка находится на складе в Ташкенте.</li>
</ul>
</div> </div>
</div>
<div class="row">
<div class="col-12">
@include('pages.parcels.status_description')
</div>
</div> </div>
</div> </div>
</section> </section>
@include('pages.parcels.declaration_modal')
@endsection @endsection
resources/views/pages/parcels/packages_onpacking.blade.php 0 → 100644
View file @ 762da84f
@extends('layouts.user_new')
@section('custom_script')
@include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
@endsection
@section('content')
<div class="row">
<div class="col-12">
<h4 class="mb-5">
<span class="text-top-title">Посылки на упаковке</span>
</h4>
</div>
</div>
<section class="section section-inset-1">
<div class="container">
@include('pages.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_ONPACKING])
<div class="row">
<div class="col-md-12">
<div class="table-responsive">
<table class="table table-hover bg-white shadow-sm table-bordered">
<thead class="thead-light">
<tr>
<th>-</th>
<th>№</th>
<th>Статус</th>
<th>Трек №</th>
<th>Количество товаров</th>
<th>Стоимость товаров</th>
<th>Вес</th>
<th>Стоимость доставки</th>
</tr>
</thead>
<tbody>
@foreach($packages as $package)
<tr>
<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 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>
</td>
<td class="text-center">${{ $package->items_cost() }}</td>
<td class="text-center">{{ $package->items_weight() }} кг</td>
<td class="text-center">{{ $package->delivery_cost }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<!-- RD Mailform-->
</div>
</div>
<div class="row mt-5">
<div class="col-12">
@include('pages.parcels.status_description')
</div>
</div>
</div>
</section>
@include('pages.parcels.declaration_modal')
@endsection
resources/views/pages/parcels/packages_pending.blade.php deleted 100644 → 0
View file @ 6ca528e7
<?php
/**
* Created by PhpStorm.
* User: RSkaldin
* Date: 6/15/2019
* Time: 2:24 AM
*/
\ No newline at end of file
resources/views/pages/parcels/packages_sent.blade.php 0 → 100644
View file @ 762da84f
@extends('layouts.user_new')
@section('custom_script')
@include('pages.packages.declaration_script', ['jsonStructure' => $jsonStructure])
@endsection
@section('content')
<div class="row">
<div class="col-12">
<h4 class="mb-5">
<span class="text-top-title">Отправленные посылки</span>
</h4>
</div>
</div>
<section class="section section-inset-1">
<div class="container">
@include('pages.parcels.package_menu', ['countPackages' => $countPackages, 'active' => \App\Models\Package::STATUS_SENT])
<div class="row">
<div class="col-md-12">
<div class="table-responsive">
<table class="table table-hover bg-white shadow-sm table-bordered">
<thead class="thead-light">
<tr>
<th>-</th>
<th>№</th>
<th>Статус</th>
<th>Трек №</th>
<th>Количество товаров</th>
<th>Стоимость товаров</th>
<th>Вес</th>
<th>Стоимость доставки</th>
</tr>
</thead>
<tbody>
@foreach($packages as $package)
<tr>
<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 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>
</td>
<td class="text-center">${{ $package->items_cost() }}</td>
<td class="text-center">{{ $package->items_weight() }} кг</td>
<td class="text-center">{{ $package->delivery_cost }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<!-- RD Mailform-->
</div>
</div>
<div class="row mt-5">
<div class="col-12">
@include('pages.parcels.status_description')
</div>
</div>
</div>
</section>
@include('pages.parcels.declaration_modal')
@endsection
resources/views/pages/parcels/status_description.blade.php 0 → 100644
View file @ 762da84f
<h5>Обозначение статусов:</h5>
<ul class="list-unstyled">
<li><span class="badge badge-danger shadow-sm">Ожидаются</span> - Посылка создана в системе, но еще не дошла до нашего склада.</li>
<li><span class="badge badge-warning shadow-sm">На складе</span> - Посылка находится на складе в США.</li>
<li><span class="badge badge-info shadow-sm">На упаковке</span> - Посылка проходит процесс упаковки и отправки.</li>
<li><span class="badge badge-primary shadow-sm">Отправленные</span> - Посылка находится в пути.</li>
<li><span class="badge badge-success shadow-sm">Доставленные</span> - Посылка находится на складе в Ташкенте.</li>
</ul>
</div>
resources/views/pages/profile/addresses.blade.php
View file @ 762da84f
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="row"> <div class="row">
<div class="col-12 section-inset-1"> <div class="col-12 section-inset-1">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover"> <table class="table table-hover bg-white border-1 shadow-sm">
<thead> <thead>
<tr class=""> <tr class="">
<th>#</th> <th>#</th>
......
routes/web.php
View file @ 762da84f
...@@ -39,7 +39,7 @@ Route::post('/feedback/add', 'FeedbackController@addGuest'); ...@@ -39,7 +39,7 @@ Route::post('/feedback/add', 'FeedbackController@addGuest');
Route::get('/packages/pay', 'PackagesController@pay'); Route::get('/packages/pay', 'PackagesController@pay');
Route::get('/packages/addr', 'PackagesController@addr'); Route::get('/packages/addr', 'PackagesController@addr');
Route::get('/packages', 'PackagesController@index')->name('package'); Route::get('/packages', 'PackagesController@pending_packages')->name('package');
Route::get('/profile/address', 'ProfileController@address')->name('address'); Route::get('/profile/address', 'ProfileController@address')->name('address');
Route::get('/profile/addaddress', 'ProfileController@addaddress')->name('address.add'); Route::get('/profile/addaddress', 'ProfileController@addaddress')->name('address.add');
Route::post('/profile/storeaddress', 'ProfileController@storeaddress')->name('address.store'); Route::post('/profile/storeaddress', 'ProfileController@storeaddress')->name('address.store');
...@@ -48,13 +48,13 @@ Route::get('/profile', 'ProfileController@profile'); ...@@ -48,13 +48,13 @@ Route::get('/profile', 'ProfileController@profile');
Route::post('/profile/save', 'ProfileController@save')->name('profile.save'); Route::post('/profile/save', 'ProfileController@save')->name('profile.save');
Route::get('/packages/list', 'PackagesController@pending_packages'); Route::get('/packages/list', 'PackagesController@pending_packages');
Route::get('/packages/pending', 'PackagesController@pending_packages'); Route::get('/packages/pending', 'PackagesController@pending_packages')->name('packagePending');
Route::get('/packages/warehouse', 'PackagesController@inwarehouse_packages'); Route::get('/packages/warehouse', 'PackagesController@inwarehouse_packages')->name('packageInwarehouse');
Route::post('/packages/warehouse', 'PackagesController@inwarehouse_packages'); Route::post('/packages/warehouse', 'PackagesController@inwarehouse_packages');
Route::get('/packages/packing', 'PackagesController@onpacking_packages'); Route::get('/packages/packing', 'PackagesController@onpacking_packages')->name('packagePacking');
Route::get('/packages/register', 'PackagesController@register'); Route::get('/packages/register', 'PackagesController@register');
Route::post('/packages/register', 'PackagesController@register'); Route::post('/packages/register', 'PackagesController@register');
Route::get('/packages/sent', 'PackagesController@sent_packages'); Route::get('/packages/sent', 'PackagesController@sent_packages')->name('packageSent');
Route::get('/profile/info', 'ProfileController@info')->middleware('auth'); Route::get('/profile/info', 'ProfileController@info')->middleware('auth');
Route::post('/profile/address/add', 'ProfileController@address_add')->middleware('auth'); Route::post('/profile/address/add', 'ProfileController@address_add')->middleware('auth');
...@@ -74,7 +74,7 @@ Auth::routes(); ...@@ -74,7 +74,7 @@ Auth::routes();
Route::get('/home', 'HomeController@index')->name('home'); Route::get('/home', 'HomeController@index')->name('home');
/** /**
* Роуты для управления складом * Роуты для управления складом Админ панель
*/ */
Route::namespace('Postman')->group(function () { Route::namespace('Postman')->group(function () {
Route::get('/postman/packages', 'PackagesController@packages_list'); Route::get('/postman/packages', 'PackagesController@packages_list');
......
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