Luis Ramos
397729ed3d
Merge pull request #4001 from pacodelaluna/3990-display-enterprise-id-in-profile
...
Display enterprise ID in profile
2019-07-05 11:14:43 +01:00
luisramos0
88312b8e4a
Make OrdersHelper.invoice_links simpler
2019-07-05 11:08:51 +01:00
luisramos0
9be3ff90f7
Make OrdersHelper.complete_order_links simpler
2019-07-05 11:06:49 +01:00
luisramos0
e66dea7e03
Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity.
2019-07-05 10:37:27 +01:00
François Turbelin
912483660f
Put the uid under the permalink
2019-07-04 09:51:32 +02:00
François Turbelin
d12a7c2c76
Apply last suggestions
2019-07-04 09:43:35 +02:00
François Turbelin
5ce2af454e
Clean id field
2019-07-03 23:00:36 +02:00
luisramos0
5184fa540c
Adapt enterprise_relationship permitting and permitted_by scopes to rails 4
2019-07-03 20:18:00 +01:00
Luis Ramos
951787d456
Merge pull request #3987 from mkllnk/3978-optimise-products-cache
...
3978 Optimise products cache
2019-07-03 19:59:07 +01:00
Luis Ramos
b35743b6e4
Merge pull request #3968 from mkllnk/3924-rescue-failing-shipment
...
Rescue checkout on shipping id conflict
2019-07-03 19:56:24 +01:00
François Turbelin
97a401a307
Display enterprise ID in profile
2019-07-03 18:10:59 +02:00
Kristina Lim
3e37c8a3f1
Change underscores in CSS classes to hyphens
...
These were triggering a warning from scss-lint.
2019-07-03 04:43:35 +08:00
Kristina Lim
691d7d735b
Reduce padding between top bar menu items
2019-07-03 04:35:44 +08:00
Kristina Lim
6d1dd76590
Cap width of hub name in top bar and wrap
2019-07-03 04:30:06 +08:00
Kristina Lim
356e00bfbb
Add space for tab bar in medium and below screens
2019-07-03 04:02:28 +08:00
Kristina Lim
5534109122
Undo setting of margin for home tagline
2019-07-03 04:02:22 +08:00
Janine Luk
ac8790ecb3
sticky header for mobile
2019-07-03 03:57:11 +08:00
Kristina Lim
653067f58c
Omit text for top bar items with icon in large
...
This affects only top bar menu items for:
* Language
* Profile
This does not update the "Log in" menu item, because the currently
selected icon might not be self explanatory.
2019-07-03 01:49:36 +08:00
Kristina Lim
06ed9c838e
Remove extra left padding from top bar menu items
2019-07-03 01:49:35 +08:00
Matt-Yorkley
726d87de6b
Fix display bug in cart button on mobile menu
2019-07-02 16:47:22 +01:00
Matt-Yorkley
fbb97c3db8
Fix JS render-blocking in Darkswarm
2019-07-02 13:43:20 +01:00
Matt-Yorkley
cea8cbd924
Preload primary font to speed up page rendering
2019-07-02 13:23:03 +01:00
Maikel Linke
73372a58ef
Remove unused and dangerous Exchange#eql? override
...
The `eql?` override has been added in very early commits but was
actually not used except in a test. It also caused performance problems
since each call to `eql?` would issue two database queries. A developer
would unknowingly trigger these when using `exchanges.uniq`. A mistake
that could have happened again in the future.
I moved the implementation to the test that was actually using it and
made a second test a bit more explicit.
2019-07-02 18:42:02 +10:00
Maikel Linke
287d6a926a
Document Exchange
2019-07-02 18:42:02 +10:00
Maikel Linke
04b07a1ff5
Further optimise querying affected exchanges
...
The implementation queried the database for each incoming variant that
was changed. This rewrite combines ActiveRecord relations so that it
creates only one query. This saves another 5-10% of execution time when
updating enterprise fees on production instances.
2019-07-02 18:42:01 +10:00
Luis Ramos
5ecab7a0c2
Merge pull request #3971 from Matt-Yorkley/basket_errors
...
Avoid `undefined method 'order'` errors when removing lineitems from basket
2019-06-26 15:33:26 +01:00
Luis Ramos
d8785bdaba
Merge pull request #3932 from luisramos0/shpfront_message
...
Improve message in private shopfront when user is not logged in or not a customer
2019-06-26 15:31:06 +01:00
Luis Ramos
00841cb537
Merge pull request #3923 from luisramos0/prod_image_error
...
User friendly error when creating a product with an image in an unsupported format
2019-06-26 15:30:18 +01:00
luisramos0
61c8859da8
Fix problem in array concatenation in orders helper and cover it with specs
2019-06-26 14:17:41 +01:00
luisramos0
e33ce235c4
Hide invoice links in order edit page if invoices are disabled
2019-06-26 14:17:41 +01:00
luisramos0
ec2f99a467
Refactor OrderHelper.order_links: extract some logic from order_links to make it more simple and pass rubocop tests
2019-06-26 14:17:41 +01:00
luisramos0
67b5f08b07
Refactor OrderHelper.order_links: extract links object to separate methods
2019-06-26 14:17:41 +01:00
luisramos0
95170bacd5
Show print invoices button in orders list page only if invoices are enabled in the backoffice
2019-06-26 14:17:25 +01:00
luisramos0
8b0296eae6
Use a single query to get filter_schedules_by_enterprise_id
2019-06-26 11:38:03 +01:00
Maikel Linke
980b4a86ab
Move shipment rescue to its own method
2019-06-26 10:48:51 +10:00
Matt-Yorkley
5100ad6b51
Improve #line_items_for logic and add more tests
2019-06-25 15:33:42 +01:00
luisramos0
7e2bead54d
Make finalizedquantity optional in the ofn-on-hand directive and extract avaiable quantity to a separate method for clarity
2019-06-25 14:50:03 +01:00
luisramos0
567196fe0e
Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
...
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
2019-06-25 14:50:03 +01:00
luisramos0
7bd32d4967
Fix usage of variant.on_hand in subscriptions order factory, we now take on_demand into account
...
This fixes a problem introduced in 12eab1bfa9 (diff-c3c4192f302cc77e9a8547012fe86ddb)
2019-06-25 14:47:47 +01:00
Luis Ramos
9b6f1a5e11
Merge pull request #3958 from Matt-Yorkley/pi_encoding
...
Improve handling of invalid characters in uploaded CSV files
2019-06-25 14:44:32 +01:00
Matt-Yorkley
0a155da273
Avoid undefined method 'order' errors when removing lineitems from basket
2019-06-25 11:13:56 +01:00
Matt-Yorkley
ead0e1c08d
Store attributes list in constant
2019-06-25 10:20:59 +01:00
Matt-Yorkley
85b3d7dac5
Move attribute check to method
2019-06-25 10:19:05 +01:00
Matt-Yorkley
84040fd2a6
Allow import to proceed when updating a product and description is set
2019-06-25 10:19:05 +01:00
luisramos0
a6ea975848
Fix editing cart when variant on_demand but on_hand is zero or negative
2019-06-24 22:07:46 +01:00
Luis Ramos
57917a498b
Merge pull request #3946 from luisramos0/missing_translatiojns
...
Fix last missing translations covered by specs
2019-06-24 20:52:59 +01:00
Maikel Linke
1e1e88fe51
Rescue checkout on shipping id conflict
...
Helps to investigate https://github.com/openfoodfoundation/openfoodnetwork/issues/3924
A better solution would be to move the update of shipments out of the
after_save callback and deal with it in controllers. Unfortunately,
that's a big and tricky task.
Since this exception is causing a lot of pain for some Australian
farmers, I introduced more logging here to understand the problem
better. The issue was observed in OFN v1 and may disappear with v2. But
we don't know that and should monitor it.
2019-06-21 16:05:54 +10:00
Maikel
e4c3c1664a
Merge pull request #3943 from jonleighton/issue-2112
...
Bring back ‘Shop for X products at:’ title
2019-06-21 15:06:21 +10:00
Maikel
5b0c8bbaef
Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
...
Improve /shops, /producers, and /groups performance
2019-06-21 15:02:19 +10:00
Maikel
71f396a44f
Merge pull request #3896 from luisramos0/clear_unit_desc
...
Clear product.variants.unit_description if product.variant_unit is items
2019-06-21 15:00:06 +10:00
