Pau Pérez Fabregat
dadc17398f
Merge pull request #5371 from Matt-Yorkley/cart-add-error
...
Cart add error handling
2020-05-06 15:22:06 +02:00
Manvil George
d1e03909ec
Minor CSS alterations to make the button visible at the bottom
2020-05-06 22:30:33 +10:00
Matt-Yorkley
9c24c1cd05
Ensure #caches_action works in test suite
2020-05-06 12:24:33 +02:00
Matt-Yorkley
7e4c00ba3f
Ensure caching works in cache tests for API controllers
2020-05-06 11:47:45 +02:00
Mathew Button
e088b27a13
Always display the outstanding balance if not zero
2020-05-06 16:45:44 +10:00
Manvil George
f802775ad6
Fixing up old Enterprise Modal references
2020-05-06 15:37:28 +10:00
Manvil George
e9cba32f31
Appeasing the Codeclimate Workers
2020-05-06 13:13:35 +10:00
Manvil George
19b5f6a562
Handling multiple enterprises at the same location
...
Changes:
* Introduced a cluster marker to denote multiple points of interest at
the same location
* Seperated out a plain enterprise modal into 2 parts
* A modal called EnterpriseModal for showing a list of enterprises at
the same location
* A box called EnterpriseBox(which by the way is also a technically a
modal) that shows the details of that particular enterprise selected
* If at a location there exists only a single enterprise then only the
box is shown
2020-05-06 12:54:42 +10:00
Robin Klaus
f43380fce5
Added inputmode attribute to show appropriate mobile keyboard for selected field
2020-05-06 12:52:53 +10:00
Robin Klaus
7dce53a77b
Added inputmode attribute to show appropriate mobile keyboard for selected field
2020-05-06 12:46:37 +10:00
Steve Roberts
4573127c59
Add NavigationCheck to order cycles edit form
...
- Simplify if statements with safe navigation operator
- Simplify order cycle nav check spec
- Rename nav check callback so a comment is not needed and remove unnecessary assignation to $scope
2020-05-06 10:43:21 +10:00
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Matt-Yorkley
13e4411b89
Add error message on cart populate failure and don't keep re-sending the data to the server.
...
This was triggering many requests to be continuously re-sent in a very problematic way (server-melting), and with no user feedback.
2020-05-05 17:22:10 +02:00
Matt-Yorkley
9a7807b134
Don't continuously re-post data on cart error
2020-05-05 16:04:05 +02:00
Matt-Yorkley
4f4b3fb206
Don't render twice 🙈
2020-05-05 15:21:05 +02:00
Matt-Yorkley
6afda87baf
Add explanatory comment on soft-deleted variant stock logic
2020-05-05 13:57:50 +02:00
Matt-Yorkley
26ba76cff9
Fix soft-deletion in CartService and update spec
2020-05-05 13:57:50 +02:00
Matt-Yorkley
a3458aa562
Ensure VariantStockLevels can process soft-deleted variants
2020-05-05 13:57:50 +02:00
Matt-Yorkley
0e429da377
Return zero available stock (total_on_hand) for variants that are soft-deleted
2020-05-05 13:57:50 +02:00
Matt-Yorkley
068c8feea7
Merge pull request #5289 from Matt-Yorkley/cart-populate
...
Cart populate
2020-05-05 13:56:17 +02:00
Matt-Yorkley
805f91e838
Remove unnecessary #all call
2020-05-05 09:56:08 +02:00
Eduardo
2fca16f02f
change shop name to be link to shop on transactions page
2020-05-04 07:06:07 -03:00
Mathew Button
fe6c810505
Add brackets in view instead of API response
2020-05-04 19:09:18 +10:00
Luis Ramos
e2b26b2e9c
Replace break with if
...
What we would need would be a continue, not break, so that other units will be processed without halting the cycle through the units
2020-05-03 12:00:23 +01:00
Luis Ramos
b92e257e44
Fix codeclimate issue
2020-05-02 19:12:47 +01:00
Luis Ramos
fa908d4024
Extract change_order_cycle partial from main enterprise shop view
2020-05-02 19:01:36 +01:00
Luis Ramos
7fd14cf29b
Adjust line height of select label and select itself
2020-05-02 19:01:36 +01:00
Luis Ramos
ef0e9dc0ca
Replace select box with text when only one OC is available for selection
2020-05-02 19:01:33 +01:00
Luis Ramos
89cb447387
Hide OC selector if shop requires login/customer
2020-05-02 17:56:49 +01:00
Luis Ramos
9ae3ad9279
Move rule on option out of the select rule to fix rubocop issue
2020-05-01 17:43:52 +01:00
Luis Ramos
240e2a36d3
Make option color explicitly gray and not white otherwise we will have options render white on white on some browsers, namely chrome on windows 10
2020-05-01 17:39:12 +01:00
Mathew Button
8087e6b31b
Show outstanding balance on orders page
...
Prior to this change, there was no way of knowing how much was owed (or
in need of refunding) at a glance for each order on the orders index page,
this information was only available by clicking through to an order
payment page
This change adds the outstanding balance for each order
2020-05-01 21:38:20 +10:00
Luis Ramos
74c7a01151
Merge pull request #5259 from luchiago/add-extra-social-media-to-emails
...
Add extra social media to order confirmation email
2020-04-30 15:01:09 +01:00
Pau Perez
1903134e13
Add timestamps to OC schedule join table
...
This is critical to debug bugs related to subscriptions.
Essentially, `has_and_belongs_to_many` doesn't give us the option for
any other column that the foreign keys themselves:
> A has_and_belongs_to_many association creates a direct many-to-many
> connection with another model, with no intervening model.
Source: https://guides.rubyonrails.org/v3.2/association_basics.html#the-has_and_belongs_to_many-association
Note however, that there's no way to update an order_cycle_schedule,
that I can think of but `updated_at` doesn't do any harm.
2020-04-30 15:00:13 +02:00
Pau Pérez Fabregat
4174ea69a1
Merge pull request #5247 from chrishil1/Placeholders_variant
...
Added placeholders in variant edit page
2020-04-30 12:05:59 +02:00
Pau Pérez Fabregat
676add18c3
Merge pull request #5322 from luisramos0/dead_content
...
Delete some dead views
2020-04-30 12:02:14 +02:00
Matt-Yorkley
a35f8cdb02
Move cache keys used in views into the cache service
2020-04-30 09:45:15 +02:00
Luis Ramos
8a107bee98
Merge pull request #5235 from luisramos0/mail_methods
...
Remove smtp config from admin config page
2020-04-29 19:10:02 +01:00
Matt-Yorkley
4054bdd722
Add Bugsnag call for "variant with no stock item" case
2020-04-29 17:34:48 +02:00
Matt-Yorkley
2bdda7de04
Change order of methods for easier reading
2020-04-29 17:22:46 +02:00
Matt-Yorkley
92a881c584
Simplify relation used in #exchanges_supplying
2020-04-29 17:19:16 +02:00
Pau Pérez Fabregat
f9f4bdae8f
Merge pull request #5238 from Matt-Yorkley/moar-performance
...
Improve Pain Points
2020-04-29 16:36:15 +02:00
Luis Ramos
407d890d23
Merge pull request #5315 from Matt-Yorkley/ordercyles-controller-tweaks
...
OrderCylesController tweaks
2020-04-29 13:50:10 +01:00
Luis Ramos
a38b18bd0d
Remove smtp config from admin config page
2020-04-29 13:34:19 +01:00
Pau Pérez Fabregat
e7df9bb58d
Merge pull request #5178 from coopdevs/dont-populate-empty-cart
...
Dont populate empty cart
2020-04-29 13:08:26 +02:00
Matt-Yorkley
d3af3d3f27
Avoid extra query on stock_items every time #on_demand is called on a variant.
...
In the case where the variant has not been saved yet, we can use #new_record? here instead of #stock_items.empty?, to avoid an additional query. This can be called a vast number of times per request, in various N+1s. The other case where we need to return here is when a variant has been deleted, so #stock_items will be empty and #stock_item will be nil. Likewise, we can just check that with #deleted? and avoid #stock_items.empty?
2020-04-28 20:54:04 +02:00
Matt-Yorkley
9682544442
Eager-load and update BasicEnterpriseSerializer
2020-04-28 20:10:40 +02:00
Matt-Yorkley
f4bcf6c6d5
Eager-load line_item associations in order
2020-04-28 20:10:40 +02:00
Luis Ramos
e6fa08edfc
Delete some dead views
2020-04-28 19:07:19 +01:00
Luis Ramos
f3e651b1f7
present? calls length which is breaking it with error ActiveModel::MissingAttributeError Exception: missing attribute: address_id
...
any? works well as it just verifies the size of the collection
2020-04-28 16:31:11 +01:00
