Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fazo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nuriddin
fazo
Commits
ea0dfabf
Commit
ea0dfabf
authored
Nov 05, 2019
by
Khumoyunmirzo Sodiqov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
dd3b3d10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
OrderController.php
app/Http/Controllers/OrderController.php
+9
-1
order_create.blade.php
resources/views/pages/parcels/order_create.blade.php
+4
-4
No files found.
app/Http/Controllers/OrderController.php
View file @
ea0dfabf
...
@@ -283,11 +283,19 @@ class OrderController extends Controller
...
@@ -283,11 +283,19 @@ class OrderController extends Controller
$orderServices
=
$request
->
get
(
'services_id'
);
$orderServices
=
$request
->
get
(
'services_id'
);
$orderProducts
=
$request
->
get
(
'products'
);
$orderProducts
=
$request
->
get
(
'products'
);
$delOptions
=
$request
->
get
(
'delivery_info'
);
$price
=
0
;
$price
=
0
;
$weight
=
0
;
$weight
=
0
;
$amount
=
0
;
$amount
=
0
;
$serSum
=
0
;
$serSum
=
0
;
$delInfo
=
''
;
if
(
$delOptions
!=
null
)
{
foreach
(
$delOptions
as
$item
)
{
$delInfo
=
$delInfo
.
' '
.
$item
;
}
}
if
(
$orderProducts
!=
null
)
{
if
(
$orderProducts
!=
null
)
{
foreach
(
$orderProducts
as
$item
)
{
foreach
(
$orderProducts
as
$item
)
{
$price
+=
$item
[
2
]
*
$item
[
1
];
$price
+=
$item
[
2
]
*
$item
[
1
];
...
@@ -319,7 +327,7 @@ class OrderController extends Controller
...
@@ -319,7 +327,7 @@ class OrderController extends Controller
'from_address'
=>
$request
->
get
(
'from_address'
),
'from_address'
=>
$request
->
get
(
'from_address'
),
'to_address_id'
=>
$request
->
get
(
'to_address_id'
),
'to_address_id'
=>
$request
->
get
(
'to_address_id'
),
'payment_is_to_office'
=>
0
,
'payment_is_to_office'
=>
0
,
'delivery_info'
=>
$
request
->
get
(
'delivery_info'
)
,
'delivery_info'
=>
$
delInfo
,
'payment_info'
=>
$request
->
get
(
'payment_type_id'
),
'payment_info'
=>
$request
->
get
(
'payment_type_id'
),
'comment'
=>
$request
->
get
(
'comment'
),
'comment'
=>
$request
->
get
(
'comment'
),
'client_type'
=>
'WEB'
,
'client_type'
=>
'WEB'
,
...
...
resources/views/pages/parcels/order_create.blade.php
View file @
ea0dfabf
...
@@ -346,7 +346,7 @@
...
@@ -346,7 +346,7 @@
<div class="
col
-
md
-
12
">
<div class="
col
-
md
-
12
">
<div class="
custom
-
control
custom
-
radio
">
<div class="
custom
-
control
custom
-
radio
">
<input type="
radio
" class="
custom
-
control
-
input
" id="
defaultUnchecked11
"
<input type="
radio
" class="
custom
-
control
-
input
" id="
defaultUnchecked11
"
name="
delivery_info
" value="
Само
-
доставка
" checked>
name="
delivery_info
[]
" value="
Само
-
доставка
" checked>
<label class="
custom
-
control
-
label
" for="
defaultUnchecked11
">Само-доставка</label>
<label class="
custom
-
control
-
label
" for="
defaultUnchecked11
">Само-доставка</label>
</div>
</div>
...
@@ -354,13 +354,13 @@
...
@@ -354,13 +354,13 @@
<div style="
display
:
grid
;
">
<div style="
display
:
grid
;
">
<div class="
custom
-
control
custom
-
radio
" style="
float
:
left
">
<div class="
custom
-
control
custom
-
radio
" style="
float
:
left
">
<input type="
radio
" class="
custom
-
control
-
input
" id="
defaultChecked22
"
<input type="
radio
" class="
custom
-
control
-
input
" id="
defaultChecked22
"
name="
delivery_info
" value="
Вызов
курьера
">
name="
delivery_info
[]
" value="
Вызов
курьера
">
<label class="
custom
-
control
-
label
" for="
defaultChecked22
">Вызов курьера</label>
<label class="
custom
-
control
-
label
" for="
defaultChecked22
">Вызов курьера</label>
</div>
</div>
<div class="
form
-
group
" style="
display
:
none
" id="
pickupDate
">
<div class="
form
-
group
" style="
display
:
none
" id="
pickupDate
">
<label class="
form
-
label
" for="
forms
-
check
-
name1
" >Дата <span
<label class="
form
-
label
" for="
forms
-
check
-
name1
" >Дата <span
style="
color
:
#ff0912">*</span></label>
style="
color
:
#ff0912">*</span></label>
<
input
class
="
form
-
control
" id="
forms
-
check
-
name1
" type="
date
" name="
delivery_info
00
"
<
input
class
="
form
-
control
" id="
forms
-
check
-
name1
" type="
date
" name="
delivery_info
[]
"
data-constraints="
@
Required
" placeholder="
Date
">
data-constraints="
@
Required
" placeholder="
Date
">
</div>
</div>
<div class="
form
-
group
" style="
display
:
none
;
float
:
right
" id="
pickupTime
">
<div class="
form
-
group
" style="
display
:
none
;
float
:
right
" id="
pickupTime
">
...
@@ -368,7 +368,7 @@
...
@@ -368,7 +368,7 @@
для
для
пикап Вашей почты <span
пикап Вашей почты <span
style="
color
:
#ff0912">*</span></label>
style="
color
:
#ff0912">*</span></label>
<
select
class
="
form
-
control
" id="
delivery_info1
" name="
delivery_info
1
"
<
select
class
="
form
-
control
" id="
delivery_info1
" name="
delivery_info
[]
"
data-placeholder="
Select
Your
Country
" required>
data-placeholder="
Select
Your
Country
" required>
<option value="
08
:
00
-
09
:
00
">08:00 - 09:00</option>
<option value="
08
:
00
-
09
:
00
">08:00 - 09:00</option>
<option value="
09
:
00
-
10
:
00
">09:00 - 10:00</option>
<option value="
09
:
00
-
10
:
00
">09:00 - 10:00</option>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment