Luis Ramos
5dedbc4231
Extract customer_required message to separate partial
2020-05-07 12:17:43 +01:00
Luis Ramos
84c00fe215
Remove duplicate conditionals already present in ShopHelper#shop_tabs, when these partials are rendered, these conditions will always be true
...
In the shops partial, by adding the else, we avoid rendering empty space with an empty
products list in case the shop is closed
2020-05-07 12:17:43 +01:00
Luis Ramos
77d7d2b804
Make the background darker only in specific cases
2020-05-07 12:17:43 +01:00
Luis Ramos
b34fb79d69
Move content div to messages partial so that it's not used in the closed shop message (no margin according to design)
2020-05-07 12:17:43 +01:00
Luis Ramos
1c41061f9e
If shop is closed show closed shop message partial in the home tab
2020-05-07 12:17:43 +01:00
Luis Ramos
b86081090f
Extract closed shop message to a partial
2020-05-07 12:17:43 +01:00
Luis Ramos
dbdbe01d6a
Add new style to closed shop message
2020-05-07 12:17:43 +01:00
Luis Ramos
0996c28c09
Memoize helper methods that are called several times in the views
2020-05-07 12:17:43 +01:00
Luis Ramos
5f70ef6e75
Improve style of closed shop message and remove border from message
2020-05-07 12:17:43 +01:00
Luis Ramos
e0b3e9a040
Remove border of message and paddings, add background color, change link color and split message in two lines
2020-05-07 12:17:43 +01:00
Luis Ramos
c64ba75e8d
Merge pull request #5348 from luisramos0/single_oc_selector
...
Replace select box with text when only one OC is available for selection
2020-05-07 12:07:19 +01:00
Luis Ramos
56b9737676
Merge pull request #5343 from luisramos0/windows
...
Make OC selector options color explicitly gray and not white
2020-05-07 11:44:14 +01:00
Luis Ramos
d967d855fc
Merge pull request #5319 from Matt-Yorkley/caching-by-class
...
[Caching] Caching data by class
2020-05-07 11:43:44 +01:00
Luis Ramos
1e9b4516cb
Merge pull request #5318 from Matt-Yorkley/caching-api
...
[Caching] API Action Caching on shop filters
2020-05-07 11:42:52 +01:00
Luis Ramos
d1392d400a
Merge pull request #5350 from luisramos0/edit_order_snail
...
Improve order edit page in data inconsistency scenario (follow up from S2 #4186 )
2020-05-06 20:33:40 +01:00
Luis Ramos
c7c8bfe212
Merge pull request #5347 from luisramos0/hide_oc_selector_for_private_shop
...
[Mobile] Hide OC selector if shop requires login/customer
2020-05-06 14:31:52 +01:00
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
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
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
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
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
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 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
