Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upStore checkout and validation updates #3213
Conversation
notbakaneko
added some commits
May 8, 2018
notbakaneko
added some commits
May 16, 2018
notbakaneko
added
the
store
label
May 16, 2018
app/Libraries/OrderCheckout.php
Outdated
| } | ||
| if ($item->quantity > $item->product->max_quantity) { | ||
| $messages[] = [trans_choice('model_validation/store/product.too_many', $item->product->max_quantity)]; |
This comment has been minimized.
This comment has been minimized.
app/Libraries/OrderCheckout.php
Outdated
| } | ||
| foreach ($messages as $array) { | ||
| // merge with existing errors, if any. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
notbakaneko
May 17, 2018
Contributor
made more sense before when there could be an existing message inside :best:
| @@ -1,65 +0,0 @@ | ||
| <?php |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
| switch ($order->status) { | ||
| case 'checkout': | ||
| case 'processing': | ||
| return 'You cannot modify your order while it is being processed.'; |
This comment has been minimized.
This comment has been minimized.
| @@ -78,7 +78,7 @@ public function show() | ||
| // using $errors will conflict with laravel's default magic MessageBag/ViewErrorBag that doesn't act like | ||
| // an array and will cause issues in shared views. | ||
| $flash = session('checkout.error.errors') ?? []; | ||
| $flash = session('checkout.error.errors') ?? $checkout->validate(); |
This comment has been minimized.
This comment has been minimized.
nanaya
May 17, 2018
Collaborator
just noticed why is it not called $validationErrors and be part of return's compact instead of its own View::share.
This comment has been minimized.
This comment has been minimized.
notbakaneko
May 17, 2018
Contributor
I think this was originally supposed to go into middleware and then didn't because of how it didn't work so great with the current structure ?_?
| padding: 10px; | ||
| margin: 0 0 5px; | ||
| // flex-wrap: wrap; |
This comment has been minimized.
This comment has been minimized.
app/Models/Store/Order.php
Outdated
| @@ -587,6 +528,7 @@ private function newOrderItem(array $params) | ||
| } | ||
| $item = new OrderItem(); | ||
| $item->order_id = $this->order_id; |
This comment has been minimized.
This comment has been minimized.
| return $this->order; | ||
| } | ||
| private static function buildMessage(Order $order) |
This comment has been minimized.
This comment has been minimized.
| @@ -464,27 +421,11 @@ public function switchItems($orderItem, $newProduct) | ||
| public static function cart($user) | ||
| { | ||
| $cart = static::query() | ||
| return static::query() |
This comment has been minimized.
This comment has been minimized.
nanaya
May 17, 2018
Collaborator
maybe add relation to User so we can do $user->storeOrders() here and Auth::user()->storeOrders()->make() for new cart.
resources/lang/en/store.php
Outdated
| @@ -23,11 +23,29 @@ | ||
| 'warehouse' => 'Warehouse', | ||
| ], | ||
| 'cart' => [ | ||
| 'errors_no_checkout' => [ |
This comment has been minimized.
This comment has been minimized.
notbakaneko
added some commits
May 17, 2018
peppy
added this to the May 2018 milestone
May 18, 2018
peppy
added
the
resolves issue
label
May 18, 2018
peppy
removed this from the May 2018 milestone
May 18, 2018
peppy
removed
the
store
label
May 18, 2018
nanaya
merged commit d60fef1
into
ppy:master
May 18, 2018
notbakaneko
referenced this pull request
May 18, 2018
Merged
Order checkout validation does not support null carts #3227
notbakaneko
deleted the
notbakaneko:feature/store-cart-validation-update
branch
Jun 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
notbakaneko commentedMay 16, 2018
Order::updateItemSome of the view parts and styles need consolidating but that's a different mess to be done separately.