Pau Perez
032dce1a88
Move OC save within success block
...
This makes more evident there are two scenarios: schedule save success
or failure. We deal with OCs failures raising an exception.
2020-05-29 10:46:29 +02:00
Pau Perez
768568c75c
Rename @object to @schedule
...
This level of abstraction makes sense in the framework-like code in
ResourceController but here it just makes things more difficult.
2020-05-29 10:44:43 +02:00
Pau Perez
4f3d01bd93
Remove unused HTML response format
2020-05-29 10:43:16 +02:00
Pau Perez
56b590a6f8
Extract #sync_subscription
...
This makes it far easier to spot what's the difference between create
and update regarding subs syncing without having to mess with `#update`
and its callbacks (for now).
2020-05-29 10:41:42 +02:00
Pau Perez
65c53df2ef
Remove unnecessary callback invocations
...
There are no registered callback methods to execute.
2020-05-29 10:25:38 +02:00
Pau Perez
f25ee8c998
Extract #editable_order_cycles
...
This makes it far easier to spot what's the difference between create
and update regarding the editable order cycles.
I stop here before a slightly deeper refactor which would make the PR
quite hard to review. This will come an upcoming one.
2020-05-29 10:25:37 +02:00
Pau Perez
4f635339e3
Fix schedule creation and subs syncing
2020-05-29 10:24:42 +02:00
Pau Perez
9a29e634fc
Deal with Schedule creation in its own controller
...
This way it can assign the order cycles to the schedule when this is
persisted. An OrderCycleSchedule (the join table) can't be created until
both schedule and order_cycle got an id.
Also, we do not call `#adapt_params` when creating the Schedule as that
assigns `order_cycle_ids` to `@object.attributes` thus, attempting to
create the OrderCycleSchedule without a schedule_id.
2020-05-28 17:49:36 +02:00
Pau Perez
e339a37cd5
Allow to create order_cycle_schedules
...
There's no way we can create an order_cycle_schedules if the schedule
doesn't have an id, which we can't get if to persist it we need an OC
first, which in turn, will create an order_cycle_schedules.
2020-05-22 14:22:31 +02:00
Pau Pérez Fabregat
16dfb3c7e9
Merge pull request #5408 from luisramos0/columns_params
...
[Spree 2.1] Add missing permitted param to Column Preferences controller
2020-05-21 14:41:30 +02:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
5f7c1474a2
Merge pull request #5377 from manvil/1782_enterprise_at_same_address
...
Handling multiple enterprises at the same location
2020-05-13 19:31:14 +01:00
Luis Ramos
ef2d7f9485
Merge pull request #5330 from openfoodfoundation/mobile-ux-filters
...
[mobile ux] Merge search and filter epic to master
2020-05-13 08:59:32 +01:00
Matt-Yorkley
598071fa78
Remove conflicting "clear search" buttons added by Chrome
2020-05-12 18:59:15 +02:00
Matt-Yorkley
265a8ed573
Move messages and products form outside of row and columns to enable full-width
2020-05-12 18:24:10 +02:00
Luis Ramos
7804c740a6
Add name to permitted params and fix some rubocop issues
2020-05-12 15:35:47 +01:00
Luis Ramos
41645e8351
Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file
...
Output logs in Delayed Job's log file
2020-05-12 10:05:26 +01:00
Matt-Yorkley
0cd4ad0a1a
Ensure large amount of search text doesn't break layout with clear all button
2020-05-10 09:44:12 +02:00
Matt-Yorkley
9f882a8674
Ensure search results feedback wraps nicely onto next line
2020-05-10 09:44:12 +02:00
Matt-Yorkley
cb9c56d8aa
Ensure correct left-alignment on text in search results feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
dee793a392
Change join word between the two filter sets to be "and", to match the actual logic
2020-05-10 09:44:12 +02:00
Matt-Yorkley
b78976fcd7
Ensure consistent styling in both "no results" and "searching for" text
2020-05-10 09:44:12 +02:00
Matt-Yorkley
82b11d6947
Ensure join words are not bold
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a75d3276a4
Include applied filters list in "no results" feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a1435e78c9
Extract applied filters feedback to partial
2020-05-10 09:44:12 +02:00
Matt-Yorkley
7be85d1dab
Use bold font with teal colour for both applied taxons and applied properties
2020-05-10 09:44:12 +02:00
Matt-Yorkley
483a654d31
Add join word "or" when both categories and properties are present
...
Previously for example with "Organic" property and "Fruit" and "Nuts" categories it rendered as: "Fruit or Nuts Organic" instead of: "Fruit or Nuts or Organic"
2020-05-10 09:44:12 +02:00
Matt-Yorkley
f6b910b38a
Fix clear search (x) button position on some layouts
...
Hopefully this will work on iPhones as well...?
2020-05-10 09:44:12 +02:00
Matt-Yorkley
ea06ec7ede
Remove smaller (less than 1em) scaling in search bar on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
07ac7dd9c7
Add explicit 'search' input type to search field.
...
In theory this should improve some of the custom-keyboard functionality added by mobiles, but the implementations will be vary...
2020-05-10 09:44:12 +02:00
Matt-Yorkley
71fb3b1845
Focus search field after it's cleared, ready for immediate typing of new search term on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
e0cb514cad
Add hover state to filters button with darker background
2020-05-10 09:44:12 +02:00
Matt-Yorkley
5ceaff24e9
Darken overlay background colour to reduce distraction
2020-05-10 09:44:11 +02:00
Matt-Yorkley
a7771a20c4
Adjust border-radius on filters button
2020-05-10 09:44:11 +02:00
Matt-Yorkley
03afae01b3
Decrease sidebar width on mobile for more tapping space
2020-05-10 09:44:11 +02:00
Matt-Yorkley
96c6da304a
Increase margin between filter selectors
2020-05-10 09:44:11 +02:00
Matt-Yorkley
2964ec138d
Update display of join words in filters list and rearrange code a bit for clarity
...
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.
$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
14d928c39d
Fix feature specs where UI has changed
2020-05-10 09:44:11 +02:00
Matt-Yorkley
6b66787004
Update "no results" layout on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4
Update "no results" styling
2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465
Update styling on search feedback bar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
026b98022c
Add clear search button in shop searchbar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff69389bb0
Make search bar "sticky" for tablets and mobile
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f24969edb1
Remove gutter padding on shop content to gain a bit more horizontal real-estate
2020-05-10 09:44:11 +02:00
Matt-Yorkley
cbb67e15ed
Extract button styles
2020-05-10 09:44:11 +02:00
Matt-Yorkley
865dcf79cb
Extract some properties to variables
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ebe00bdc31
Update filters clear button functionality
2020-05-10 09:44:11 +02:00
Matt-Yorkley
9eaf55f4c0
Add missing translation key
2020-05-10 09:44:11 +02:00
Matt-Yorkley
d1ea2c5f77
Extract shop searchbar styles to separate file
2020-05-10 09:44:11 +02:00
Matt-Yorkley
035bde9eff
Define breakpoints in mixin and refactor
2020-05-10 09:44:11 +02:00
