Luis Ramos
0a6bd1424c
Make ship method display on back_end work correcly by making checkout ignore ship methods configured for backoffice only
...
Adding both unit and feature tests as this is important enough for that
2020-05-08 12:59:17 +01:00
Luis Ramos
40dd307a35
Remove shipping method display on front_end option, it is not working and it's not straight forward to make it work correctly
2020-05-08 12:00:58 +01:00
Pau Pérez Fabregat
60470aaf9f
Merge pull request #5332 from coopdevs/add-timestamps-to-oc-schedule
...
Add timestamps to OC schedule join table
2020-05-08 10:51:43 +02:00
Luis Ramos
424932d61b
Merge pull request #5262 from luisramos0/closed_shop_msg
...
[Mobile] Improve the design of shop page messages (closed shop, private shop and select OC)
2020-05-08 07:52:58 +01:00
Luis Ramos
052dbca1ba
Merge pull request #5370 from Matt-Yorkley/dont-render-twice
...
Don't render twice
2020-05-07 18:15:47 +01:00
Pau Perez
ee94101edd
Log subs jobs to DJ's log file
...
There's a bunch of logging bits we need to find out what happened in
`#5294`, the first of which is logging as we are used to for Rails
itself. Turns out we were already logging but the log lines weren't
displayed.
That's because workers have no access to the Rails logger unless we hack
things a bit in the config/initializer. If we want to keep DJ's logs in
a different file, which I think is good for debugging purposes, we need
to diverge from Rails.logger.
However, there's no access to Delayed::Worker.logger in custom job
classes either so there's no way other than mimicking that logger's format
if we want log lines to be consistent.
Now the current logs will see the light like:
```
2020-05-07T14:09:42+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) RUNNING
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 1
2020-05-07T14:09:42+0000: Issue in Subscription Order 2: complete
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 7
2020-05-07T14:09:42+0000: Issue in Subscription Order 3: complete
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) COMPLETED after 0.3378
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] 1 jobs processed at 2.8054 j/s, 0 failed
```
We'll see if we need to format these messages differently to make them
more greppeable.
2020-05-07 17:21:39 +02:00
Luis Ramos
c9b60d0f62
Merge pull request #5341 from mathewdbutton/5173-show-outstanding-order-balance-on-orders-page
...
Show outstanding balance on orders page
2020-05-07 16:03:58 +01:00
Luis Ramos
52b39d04a4
Merge pull request #5359 from mbudm/issue/5108
...
Add NavigationCheck to order cycles edit form
2020-05-07 14:37:32 +01:00
Manvil George
63a1a6fefa
More optimsations: removing unwanted code
2020-05-07 22:58:09 +10:00
Luis Ramos
66fe26fcc5
Merge pull request #5295 from Matt-Yorkley/shopfront-optimising
...
Enterprise serializer optimisations
2020-05-07 13:08:14 +01:00
Matt-Yorkley
6b6ab864ef
Improve comment on Fragment Caching
2020-05-07 13:20:30 +02:00
Matt-Yorkley
37821beb1b
Extract home stats caching to method in service
2020-05-07 13:20:30 +02:00
Matt-Yorkley
2292cbaae4
Extract timed enterprise AMS fragment caching options to service
2020-05-07 13:20:28 +02:00
Luis Ramos
3c7970f72f
Add select oc message when there are multiple OCs
2020-05-07 12:18:40 +01:00
Luis Ramos
d4980893a1
Refactor darker-background directive, extract method
2020-05-07 12:17:43 +01:00
Luis Ramos
0d6d071db2
Remove dead class .shopfront_hidden_message
2020-05-07 12:17:43 +01:00
Luis Ramos
cba9382230
Replace line-height with margin
2020-05-07 12:17:43 +01:00
Luis Ramos
7fcee0fe6d
Fix problem in warning sign
2020-05-07 12:17:43 +01:00
Luis Ramos
f3347a8e16
Make teal links appear only when the darker background is activated
...
This way links in producers, about, etc, where the background is white will still appear as orange, as per design
2020-05-07 12:17:43 +01:00
Luis Ramos
782988b61c
Fix with-darker-background class by moving it inside page-view selector and using opacity instead of just grey so that other elements in the page (shadow from element above) can be seen
2020-05-07 12:17:43 +01:00
Luis Ramos
ba25986756
Fix some css rubocop issues
2020-05-07 12:17:43 +01:00
Luis Ramos
098ad6f250
Merge partial messages back to home partial where it is only used
2020-05-07 12:17:43 +01:00
Luis Ramos
319657d2c5
Move closed shop partial to /messages
2020-05-07 12:17:43 +01:00
Luis Ramos
eb773a813e
Extract open shop message to partial
2020-05-07 12:17:43 +01:00
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
Matt-Yorkley
2876b98155
Use time-based caching on rendered AMS data for shops
2020-05-07 13:11:53 +02:00
Matt-Yorkley
545ca85644
Extract caching of homepage stats to service
2020-05-07 13:11:28 +02: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
Manvil George
a629e1ecb7
Remove incorrect commenting
2020-05-07 11:46:49 +10:00
Manvil George
d7cf825531
Minimised version of the svg
2020-05-07 11:33:35 +10:00
Manvil George
585a754b18
Missed out on inverting the boolean expression
2020-05-07 11:31:27 +10:00
Manvil George
d3504c177e
A better SVG
2020-05-07 10:40:48 +10:00
Manvil George
7123d8347a
XML Formatted The SVG
2020-05-07 09:50:27 +10:00
Manvil George
7847c4ed9e
Removing unwanted blank lines
2020-05-07 09:37:35 +10:00
Manvil George
5b009f606a
More optimizations around coding standards
2020-05-07 09:07:32 +10: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
Manvil George
bf3bb4fb63
Review Comments incorporation
2020-05-07 00:54:01 +10: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
