Skip to content

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

Fixed create package

parent bf7501a1
Show whitespace changes
Inline Side-by-side
Showing with 313 additions and 206 deletions
.idea/workspace.xml
View file @ aa723582
...@@ -2,7 +2,9 @@ ...@@ -2,7 +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 beforePath="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/user.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$/resources/views/addpackage.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/addpackage.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.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" />
...@@ -29,7 +31,7 @@ ...@@ -29,7 +31,7 @@
<entry key="css" value="3" /> <entry key="css" value="3" />
<entry key="env" value="1" /> <entry key="env" value="1" />
<entry key="ico" value="1" /> <entry key="ico" value="1" />
<entry key="php" value="95" /> <entry key="php" value="103" />
<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" />
...@@ -37,10 +39,10 @@ ...@@ -37,10 +39,10 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="Blade" value="45" /> <entry key="Blade" value="52" />
<entry key="CSS" value="3" /> <entry key="CSS" value="3" />
<entry key="Image" value="5" /> <entry key="Image" value="5" />
<entry key="PHP" value="50" /> <entry key="PHP" value="51" />
<entry key="PLAIN_TEXT" value="2" /> <entry key="PLAIN_TEXT" value="2" />
<entry key="SVG" value="1" /> <entry key="SVG" value="1" />
</counts> </counts>
...@@ -49,14 +51,14 @@ ...@@ -49,14 +51,14 @@
<counts> <counts>
<entry key="css" value="12" /> <entry key="css" value="12" />
<entry key="env" value="15" /> <entry key="env" value="15" />
<entry key="php" value="15332" /> <entry key="php" value="15399" />
</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="8732" /> <entry key="Blade" value="8797" />
<entry key="CSS" value="12" /> <entry key="CSS" value="12" />
<entry key="PHP" value="6600" /> <entry key="PHP" value="6602" />
<entry key="PLAIN_TEXT" value="15" /> <entry key="PLAIN_TEXT" value="15" />
</counts> </counts>
</usages-collector> </usages-collector>
...@@ -64,92 +66,79 @@ ...@@ -64,92 +66,79 @@
</component> </component>
<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">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="46" column="24" selection-start-line="46" selection-start-column="24" selection-end-line="46" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<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$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663"> <state relative-caret-position="281">
<caret line="229" column="21" lean-forward="true" selection-start-line="229" selection-start-column="21" selection-end-line="229" selection-end-column="21" /> <caret line="117" column="28" selection-start-line="117" selection-start-column="20" selection-end-line="117" selection-end-column="28" />
</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/Models/Package.php"> <entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="3726">
<caret line="51" column="31" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="31" /> <caret line="207" column="166" selection-start-line="207" selection-start-column="166" selection-end-line="207" selection-end-column="166" />
</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/index.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="486"> <state relative-caret-position="504">
<caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" /> <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
</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/profile.blade.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="568"> <state relative-caret-position="461">
<caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" /> <caret line="64" column="82" selection-start-line="64" selection-start-column="82" selection-end-line="64" selection-end-column="82" />
</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/profile/profile_edit.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="591">
<caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
</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/contacts.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="112"> <state relative-caret-position="252">
<caret line="75" column="57" lean-forward="true" selection-start-line="75" selection-start-column="57" selection-end-line="75" selection-end-column="57" /> <caret line="14" column="9" lean-forward="true" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
</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/addpackage.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="630">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> <caret line="35" column="32" lean-forward="true" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
</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$/app/Http/Controllers/ProfileController.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/packages/register_package.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="2102">
<caret line="297" column="42" lean-forward="true" selection-start-line="297" selection-start-column="42" selection-end-line="297" selection-end-column="42" /> <caret line="225" column="11" selection-start-line="134" selection-end-line="225" selection-end-column="11" />
</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$/resources/views/pages/profile/user.blade.php"> <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="36"> <state relative-caret-position="-26">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" /> <caret line="21" column="80" selection-start-line="21" selection-start-column="80" selection-end-line="21" selection-end-column="80" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -182,9 +171,11 @@ ...@@ -182,9 +171,11 @@
<find>save</find> <find>save</find>
<find>Адреса</find> <find>Адреса</find>
<find>address</find> <find>address</find>
<find>addr</find>
<find>profile</find> <find>profile</find>
<find>ProfileController@profile</find> <find>ProfileController@profile</find>
<find>addr</find>
<find>pending_packages</find>
<find>register</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -231,12 +222,12 @@ ...@@ -231,12 +222,12 @@
<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$/app/Http/Controllers/ProfileController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/routes/web.php" /> <option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" /> <option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -497,12 +488,12 @@ ...@@ -497,12 +488,12 @@
<workItem from="1559392286763" duration="1822000" /> <workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" /> <workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" /> <workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="24209000" /> <workItem from="1560092291448" duration="26791000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="98406000" /> <option name="totallyTimeSpent" value="100988000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
...@@ -563,33 +554,6 @@ ...@@ -563,33 +554,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf/config/dompdf.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1944" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf/src/Facade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/vendor/barryvdh/laravel-dompdf/src/PDF.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1296" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/admin/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
<caret line="18580" column="1" lean-forward="true" selection-start-line="18580" selection-start-column="1" selection-end-line="18580" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="120" column="20" selection-start-line="120" selection-start-column="20" selection-end-line="120" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/users/edit.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/pages/admin/users/edit.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2052"> <state relative-caret-position="2052">
...@@ -847,31 +811,6 @@ ...@@ -847,31 +811,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406">
<caret line="45" column="26" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560289990171" expanded="true" signature="1184:1238" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
</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="663">
<caret line="229" column="21" lean-forward="true" selection-start-line="229" selection-start-column="21" selection-end-line="229" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Package.php"> <entry file="file://$PROJECT_DIR$/app/Models/Package.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="378">
...@@ -907,24 +846,80 @@ ...@@ -907,24 +846,80 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="297" column="42" lean-forward="true" selection-start-line="297" selection-start-column="42" selection-end-line="297" selection-end-column="42" />
</state>
</provider>
</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="504">
<caret line="28" column="8" lean-forward="true" 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">
<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="252">
<caret line="14" column="9" lean-forward="true" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
</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="630">
<caret line="35" column="32" lean-forward="true" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
</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="281">
<caret line="117" column="28" selection-start-line="117" selection-start-column="20" selection-end-line="117" selection-end-column="28" />
</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="378"> <state relative-caret-position="461">
<caret line="46" column="24" selection-start-line="46" selection-start-column="24" selection-end-line="46" selection-end-column="49" /> <caret line="64" column="82" selection-start-line="64" selection-start-column="82" selection-end-line="64" selection-end-column="82" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="950">
<caret line="297" column="42" lean-forward="true" selection-start-line="297" selection-start-column="42" selection-end-line="297" selection-end-column="42" /> <caret line="118" column="62" lean-forward="true" selection-start-line="118" selection-start-column="62" selection-end-line="118" selection-end-column="62" />
<folding>
<element signature="n#style#0;n#img#0;n#a#0;n#div#0;n#div#0;n#section#0;n#footer#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<marker date="1560295058654" expanded="true" signature="1184:1238" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php"> <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="36"> <state relative-caret-position="-26">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" /> <caret line="21" column="80" selection-start-line="21" selection-start-column="80" selection-end-line="21" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/register_package.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2102">
<caret line="225" column="11" selection-start-line="134" selection-end-line="225" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3726">
<caret line="207" column="166" selection-start-line="207" selection-start-column="166" selection-end-line="207" selection-end-column="166" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
app/Http/Controllers/PackagesController.php
View file @ aa723582
...@@ -121,7 +121,7 @@ class PackagesController extends Controller ...@@ -121,7 +121,7 @@ class PackagesController extends Controller
try { try {
$this->handle_save($request); $this->handle_save($request);
Session::flash('success', 'Ваша посылка успешно создана'); Session::flash('success', 'Ваша посылка успешно создана');
return redirect('/packages/list'); return redirect('/packages');
} catch (Exception $ex) { } catch (Exception $ex) {
Session::flash('error', 'Ошибка сохранения информации о посылке: '.$ex->getMessage()); Session::flash('error', 'Ошибка сохранения информации о посылке: '.$ex->getMessage());
} }
......
resources/views/addpackage.blade.php
View file @ aa723582
...@@ -9,106 +9,218 @@ ...@@ -9,106 +9,218 @@
</section> </section>
<section class="section section-inset-1"> <section class="section section-inset-1">
<div class="container"> <div class="container">
<div class="row row-10"> <form action="{{ url('/packages/register') }}" method="POST" class="needs-validation border border-success bg-white p-5" novalidate>
<div class="col-xs-12">
<div class="form-wrap">
<label class="form-label" for="forms-check-name">Package name...</label>
<input class="form-input" id="forms-check-name" type="text" name="name" data-constraints="@Required">
</div>
</div>
{{ csrf_field() }}
<h4 class="d-flex justify-content-between align-items-center mb-3">
<span class="text-muted">Регистрация новой входящей посылки</span>
</h4>
<div class="row">
<div class="col-md-6 mb-3">
<label for="market_link">Ссылка на магазин в США</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" id="market_link" name="market_link" placeholder="" value="" required>
<div class="invalid-feedback">
Обязательное поле.
</div> </div>
<div class="row row-10">
<div class="col-xs-6 col-sm-3">
<div class="form-wrap">
<label class="form-label" for="forms-check-name">Item name...</label>
<input class="form-input" id="forms-check-name" type="text" name="name" data-constraints="@Required">
</div>
</div>
<div class="col-xs-6 col-sm-3">
<div class="form-wrap">
<label class="form-label" for="forms-check-name">Tracking #...</label>
<input class="form-input" id="forms-check-name" type="text" name="name" data-constraints="@Required">
</div>
</div>
<div class="col-xs-3 col-sm-1">
<div class="form-wrap">
<label class="form-label" for="forms-check-last-name">qty.</label>
<input class="form-input" id="forms-check-last-name" type="text" name="last-name" data-constraints="@Required">
</div> </div>
<div class="col-md-6 mb-3">
<label for="track_number">Трек номер посылки</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" id="track_number" name="track_number" placeholder="" value="" required>
<div class="invalid-feedback">
Обязательное поле.
</div> </div>
<div class="col-xs-3 col-sm-1">
<div class="form-wrap">
<label class="form-label" for="forms-check-company">val.</label>
<input class="form-input" id="forms-check-company" type="text" name="company" data-constraints="@Required">
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3">
<a class="btn btn-primary btn-sm btn-shape-default btn-min-width-sm" href="buttons.html#">Add item</a> <div class="mb-3">
<label for="package_name">Название посылки</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" name="package_name" id="package_name">
<div class="invalid-feedback">
Пожалуйста введите название посылки
</div> </div>
</div> </div>
<div class="row"> <div class="mb-3">
<label for="comment">Комментарий к посылке</label>
<input type="text" class="form-input form-control-has-validation form-control-last-child" name="comment" id="comment" >
</div>
<div class="col-xs-12 section-inset-1"> <br/>
<div class="table-responsive "> <h4>Декларация посылки</h4>
<table class="table table-hover text-left"> <table class="table table-hover text-left table-light " id="table_package">
<thead> <thead class="thead-light">
<tr class="bg-dark"> <tr class="d-flex">
<th>#</th> <th class="col-1 text-center">№</th>
<th>Name</th> <th class="col-3">Название товара</th>
<th>Tracking #</th> <th class="col-2">Количество</th>
<th>Quantity</th> <th class="col-2">Цена</th>
<th>Value</th> <th class="col-2">Вес</th>
<th>Manage</th> <th class="col-1">Стоим...</th>
<th class="col-1"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr class="d-flex">
<td>1</td> <td class="text-center col-1 counter_number">1</td>
<td><a href="#">Fashions</a></td> <td class="col-3">
<td> ASD1212121 <input type="text" name="item_name[]" class="form-input form-control-has-validation form-control-last-child" required />
</td> </td>
<td>1</td> <td class="col-2">
<div class="input-group input-group-sm">
<td>$29.00</td> <div class="input-group-prepend input-group-sm">
<td> <span class="input-group-text">шт</span>
<i class="fa fa-times-circle"></i> </div>
<input type="number" name="amount[]" class="form-input form-control-has-validation form-control-last-child count" id="" value="1" required>
<div class="invalid-feedback" >
Укажите количество единиц товара
</div>
</div>
</td> </td>
</tr> <td class="col-2">
<tr> <div class="input-group input-group-sm">
<td>1</td> <div class="input-group-prepend input-group-sm">
<td><a href="#">Fashions</a></td> <span class="input-group-text">$</span>
<td> ASD1212121 </div>
<input type="number" name="price[]" class="form-input form-control-has-validation form-control-last-child cost" id="" placeholder="Username" value="2" required>
<div class="invalid-feedback" >
Укажите стоимость за единицу товара
</div>
</div>
</td> </td>
<td>1</td> <td class="col-2">
<div class="input-group input-group-sm">
<td>$29.00</td> <div class="input-group-prepend input-group-sm">
<td> <span class="input-group-text">кг</span>
<i class="fa fa-times-circle"></i> </div>
<input type="number" step="0.1" name="weight[]" class="form-input form-control-has-validation form-control-last-child" id="username" placeholder="Username" value="0.3" required>
<div class="invalid-feedback" >
Your username is required.
</div>
</div>
</td> </td>
</tr> <td class="text-center col-1">
<tr> <span class="cost_per_stuff">$2</span>
<td>1</td>
<td><a href="#">Fashions</a></td>
<td> ASD1212121
</td> </td>
<td>1</td> <td class="col-1 text-center">
<a href="#" class="btn btn-sm btn-outline-danger btn-round button-delete">X</a>
<td>$29.00</td>
<td>
<i class="fa fa-times-circle"></i>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<!-- RD Mailform-->
<button class="btn btn-primary btn-sm pull-sm-right" type="submit">Add Order</button> <div class="row">
<div class="col-6">
<a href="#" class="btn btn-sm btn-primary btn-primary-variant-1 btn-min-width-sm btn-shadow" id="add_new_packet"><strong>+ Добавить посылку</strong></a>
</div>
<div class="col-6 text-right">
Итоговая сумма в декларации: <strong><span class="text-success" id="total_price">$2</span></strong>
</div>
</div> </div>
<hr class="mb-4">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="same-address">
<label class="custom-control-label" for="same-address">Сделать фотографию посылки</label>
</div> </div>
<hr class="mb-4">
<button class="btn btn-success btn-lg btn-block" type="submit">Зарегистрировать</button>
</form>
</div> </div>
</section> </section>
@endsection @endsection
@section('custom_script')
<script>
var counter = 1;
function count_total_cost()
{
var total_sum = 0;
$('#table_package').find('tbody > tr').each(function (i, el) {
var cost = $(this).find('.cost_per_stuff').text().slice(1);
total_sum += parseInt(cost);
});
$('#total_price').text('$' + total_sum);
}
function recount_order()
{
counter = 1;
$('.counter_number').each(function () {
$(this).html(counter);
counter += 1;
});
}
$('#table_package').on('keyup, focusout', '.count, .cost', function () {
$(this).parent().parent().parent().find('.cost_per_stuff').text('$' +
$(this).parent().parent().parent().find('.count').val() * $(this).parent().parent().parent().find('.cost').val()
);
count_total_cost();
});
$('#table_package').on('click', '.button-delete', function (e) {
e.preventDefault();
$(this).parent().parent().remove();
count_total_cost();
recount_order();
});
$('#add_new_packet').click(function (e) {
e.preventDefault();
counter += 1;
$('#table_package > tbody:last-child').append('<tr class="d-flex">\n' +
' <td class="text-center col-1 counter_number">' + counter + '</td>\n' +
' <td class="col-3">\n' +
' <input type="text" name="item_name[]" class="form-input form-control-has-validation form-control-last-child" required />\n' +
' </td>\n' +
' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' +
' <div class="input-group-prepend input-group-sm">\n' +
' <span class="input-group-text">шт</span>\n' +
' </div>\n' +
' <input type="number" name="amount[]" class="form-input form-control-has-validation form-control-last-child count" id="" value="1" required>\n' +
' <div class="invalid-feedback" >\n' +
' Укажите количество единиц товара\n' +
' </div>\n' +
' </div>\n' +
' </td>\n' +
' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' +
' <div class="input-group-prepend input-group-sm">\n' +
' <span class="input-group-text">$</span>\n' +
' </div>\n' +
' <input type="number" name="price[]" class="form-input form-control-has-validation form-control-last-child cost" id="" placeholder="Username" value="2" required>\n' +
' <div class="invalid-feedback" >\n' +
' Укажите стоимость за единицу товара\n' +
' </div>\n' +
' </div>\n' +
' </td>\n' +
' <td class="col-2">\n' +
' <div class="input-group input-group-sm">\n' +
' <div class="input-group-prepend input-group-sm">\n' +
' <span class="input-group-text">кг</span>\n' +
' </div>\n' +
' <input type="number" step="0.1" name="weight[]" class="form-input form-control-has-validation form-control-last-child" id="username" placeholder="Username" value="0.3" required>\n' +
' <div class="invalid-feedback" >\n' +
' Your username is required.\n' +
' </div>\n' +
' </div>\n' +
' </td>\n' +
' <td class="text-center col-1">\n' +
' <span class="cost_per_stuff">$2</span>\n' +
' </td>\n' +
' <td class="col-1 text-center">\n' +
' <a href="#" class="btn btn-sm btn-outline-danger btn-round button-delete">X</a>\n' +
' </td>\n' +
' </tr>');
count_total_cost();
recount_order();
});
</script>
@endsection
\ No newline at end of file
resources/views/layouts/user.blade.php
View file @ aa723582
...@@ -95,8 +95,11 @@ ...@@ -95,8 +95,11 @@
<footer class="page-foot section-inset-4 bg-dark"> <footer class="page-foot section-inset-4 bg-dark">
<section class="footer-content"> <section class="footer-content">
<div class="container"> <div class="container">
<div class="rd-navbar-brand pull-lg-left"><a class="brand-name" href="index.html"><img src="/assets/img/icon/logo.png" <div class="rd-navbar-brand pull-lg-left">
class="logo_main" alt=""><span>Fazoshop</span></a></div> <a class="brand-name" href="#">
<img src="/assets/img/icon/logo.png" class="logo_main" alt="Fazoshop" style="margin-right: 10px"><span>Fazoshop</span>
</a>
</div>
<ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right"> <ul class="list-inline list-inline-mod-1 visible-md-inline-block visible-lg-inline-block pull-sm-right">
<li><a href="/">На главную</a></li> <li><a href="/">На главную</a></li>
<li><a href="{{ route('package') }}">Посылки</a> <li><a href="{{ route('package') }}">Посылки</a>
...@@ -116,9 +119,6 @@ ...@@ -116,9 +119,6 @@
<ul class="list-inline pull-sm-right offset-3"> <ul class="list-inline pull-sm-right offset-3">
<li><a class="fa-facebook" href="#"></a></li> <li><a class="fa-facebook" href="#"></a></li>
<li><a class="fa-twitter" href="#"></a></li> <li><a class="fa-twitter" href="#"></a></li>
<li><a class="fa-pinterest-p" href="#"></a></li>
<li><a class="fa-vimeo" href="#"></a></li>
<li><a class="fa-google" href="#"></a></li>
<li><a class="fa-rss" href="#"></a></li> <li><a class="fa-rss" href="#"></a></li>
</ul> </ul>
</div> </div>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<script src="/frontend/js/core.min.js"></script> <script src="/frontend/js/core.min.js"></script>
<script src="/frontend/js/script.js"></script> <script src="/frontend/js/script.js"></script>
@yield('custom_script')
</body> </body>
</html> </html>
\ 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