Skip to content

Commit

Permalink
fix(stripe): the fullname (mrvautin#243)
Browse files Browse the repository at this point in the history
* fix(stripe): the fullname

* fix(view): order status problem with multi langs

* fix(view): order status problem with multi langs

* fix(view): order status problem with multi langs
  • Loading branch information
bulog authored Oct 29, 2021
1 parent 6f0fb5f commit 0639174
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion lib/payments/stripe.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ router.post('/checkout_action', async (req, res, next) => {
source: req.body.token,
description: stripeConfig.stripeDescription,
shipping: {
name: `${req.session.customerFirstname} ${req.session.customerFirstname}`,
name: `${req.session.customerFirstname} ${req.session.customerLastname}`,
address: {
line1: req.session.customerAddress1,
line2: req.session.customerAddress2,
Expand Down
14 changes: 7 additions & 7 deletions views/order-create.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<div class="form-group">
<label for="exampleInputEmail1">Order Status</label>
<select class="form-control" id="orderStatus">
<option>{{ @root.__ "Completed" }}</option>
<option>{{ @root.__ "Paid" }}</option>
<option selected>{{ @root.__ "Pending" }}</option>
<option>{{ @root.__ "Cancelled" }}</option>
<option>{{ @root.__ "Declined" }}</option>
<option>{{ @root.__ "Shipped" }}</option>
<option value="Completed">{{ @root.__ "Completed" }}</option>
<option value="Paid">{{ @root.__ "Paid" }}</option>
<option selected value="Pending">{{ @root.__ "Pending" }}</option>
<option value="Cancelled">{{ @root.__ "Cancelled" }}</option>
<option value="Declined">{{ @root.__ "Declined" }}</option>
<option value="Shipped">{{ @root.__ "Shipped" }}</option>
</select>
</div>
</div>
Expand Down Expand Up @@ -114,4 +114,4 @@
</div>
</div>
</div>
</main>
</main>
14 changes: 7 additions & 7 deletions views/order.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<strong> Order status: </strong><span class="text-{{getStatusColor result.orderStatus}} float-right">{{result.orderStatus}}</span>
<div class="float-right col-md-2">
<select class="form-control" id="orderStatus">
<option>{{ @root.__ "Completed" }}</option>
<option>{{ @root.__ "Paid" }}</option>
<option>{{ @root.__ "Pending" }}</option>
<option>{{ @root.__ "Cancelled" }}</option>
<option>{{ @root.__ "Declined" }}</option>
<option>{{ @root.__ "Shipped" }}</option>
<option value="Completed">{{ @root.__ "Completed" }}</option>
<option value="Paid">{{ @root.__ "Paid" }}</option>
<option value="Pending">{{ @root.__ "Pending" }}</option>
<option value="Cancelled">{{ @root.__ "Cancelled" }}</option>
<option value="Declined">{{ @root.__ "Declined" }}</option>
<option value="Shipped">{{ @root.__ "Shipped" }}</option>
</select>
</div>
</li>
Expand Down Expand Up @@ -75,4 +75,4 @@
</ul>
<input type="hidden" id="order_id" value="{{result._id}}">
</div>
</main>
</main>
16 changes: 8 additions & 8 deletions views/orders.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<form class="form-inline float-sm-right">
<label for="orderStatusFilter" class="control-label formLabel right-pad-10">Status</label>
<select class="form-control" id="orderStatusFilter">
<option>{{ @root.__ "Completed" }}</option>
<option>{{ @root.__ "Paid" }}</option>
<option>{{ @root.__ "Created" }}</option>
<option>{{ @root.__ "Cancelled" }}</option>
<option>{{ @root.__ "Declined" }}</option>
<option>{{ @root.__ "Shipped" }}</option>
<option>{{ @root.__ "Pending" }}</option>
<option value="Completed">{{ @root.__ "Completed" }}</option>
<option value="Paid">{{ @root.__ "Paid" }}</option>
<option value="Created">{{ @root.__ "Created" }}</option>
<option value="Cancelled">{{ @root.__ "Cancelled" }}</option>
<option value="Declined">{{ @root.__ "Declined" }}</option>
<option value="Shipped">{{ @root.__ "Shipped" }}</option>
<option value="Pending">{{ @root.__ "Pending" }}</option>
</select>
</form>
</div>
Expand Down Expand Up @@ -71,4 +71,4 @@
<input type="hidden" id="pageNum" value="{{pageNum}}">
<input type="hidden" id="totalItemCount" value="{{totalItemCount}}">
<input type="hidden" id="paginateUrl" value="{{paginateUrl}}">
<input type="hidden" id="searchTerm" value="{{searchTerm}}">
<input type="hidden" id="searchTerm" value="{{searchTerm}}">

0 comments on commit 0639174

Please sign in to comment.