Masha
d5ff733f0b
spaces location swapped
2019-05-08 15:05:13 +01:00
Masha
5470f8d758
new translation key for products_or created
2019-05-08 15:03:28 +01:00
Masha
94cbac00a5
& replaced by OR when multiple property filters are selected
2019-05-08 15:00:59 +01:00
luisramos0
77178ca595
Add href and target attributes to product serializer sanitizer to allow links with target in product descriptions
2019-05-08 14:46:57 +01:00
idanceinbetween
7790401d59
added buttons to form and updated sanitizer to allow extra formatting
2019-05-08 14:45:05 +01:00
Maikel Linke
a3adbd9fc8
Replace connect-learn banner with custom content
...
The connect and learn banner is only used in Australia at the moment. We
would like to have customisable content here. Now every instance can
choose to place a custom alert banner at the top. Unfortunately, custom
banners are not translated into other languages. That's why I kept the
standard register call. For example, the register call is in use where
it is displayed in French and Italian. Completely switching to custom
content would break the translation.
Translations in custom content are an existing feature request,
"multi-lang 2.0".
2019-05-08 11:38:49 +10:00
Luis Ramos
4c767cd5b4
Merge pull request #3802 from kristinalim/fix/order_cycle_optimizations
...
3760 Optimizations related to OCs
2019-05-07 21:12:44 +01:00
Luis Ramos
6658f85f59
Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation
...
3292 link popup text translation
2019-05-07 21:11:31 +01:00
Luis Ramos
dffa50468b
Merge pull request #3801 from Matt-Yorkley/need_for_speed
...
Fix /maps performance
2019-05-07 21:08:34 +01:00
Kristina Lim
12b28fdc32
Remove "Debug Information" in edit OC page
2019-05-08 01:33:58 +08:00
Pau Pérez Fabregat
fc38906e60
Merge pull request #3672 from Matt-Yorkley/spree2/pi_shipping_category
...
[Spree Upgrade] shipping_category now required for products
2019-05-07 16:12:05 +02:00
Kristina Lim
c3d4288692
Fix translation for closed/closes in subscription update modal
2019-05-07 14:52:03 +08:00
Syed Usama Amer
f71df770d0
added social links
2019-05-06 23:28:14 -05:00
Matt-Yorkley
6a8a67560b
Fix API authentication
2019-05-07 00:36:08 +01:00
Matt-Yorkley
6bdc5d4438
Fix maps performance
2019-05-07 00:36:08 +01:00
Kristina Lim
56bc497fe2
Simplify code for enterprise serializer for OCs
2019-05-06 23:49:55 +08:00
lin-d-hop
7b87e609c4
Set master variant price in products controller
...
Set master variant price in products controller
Code climate tidy up
Syntax improvement
Revert "Remove non-functional Price field from Edit Product screen"
This reverts commit 585072302c585072302c
2019-05-06 14:20:01 +01:00
Kristina Lim
7593168341
Update code style for Enterpise.not_ready_for_checkout
...
This was changed into multiple lines for readability.
2019-05-06 18:37:28 +08:00
Kristina Lim
c0a5bcce92
Update some comments in Enterprise and OrderCycle models
2019-05-06 18:35:01 +08:00
Kristina Lim
4430c88a95
Eager-load some data for admin order cycle pages
2019-05-06 15:41:29 +08:00
Kristina Lim
f14e7e97b1
Do not check need to warn of invalid OCs unless request is HTML
2019-05-06 15:41:29 +08:00
Kristina Lim
781afc1015
Change OC :suppliers and :distributors to associations
2019-05-06 13:43:44 +10:00
Kristina Lim
71bff0dd5b
Reduce the number of queries in Enterprise.not_ready_for_checkout
2019-05-06 13:43:44 +10:00
lin-d-hop
10fba9b39f
Add translation to order cycle spinner
...
lazy text
2019-05-05 19:12:53 +01:00
lin-d-hop
585072302c
Remove non-functional Price field from Edit Product screen
...
Update initializer to override Product Price as required field.
Revert "Update initializer to override Product Price as required field."
This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.
2019-05-05 16:41:54 +01:00
Matt-Yorkley
3323ac7650
Fix duplicate error messages
2019-05-05 13:30:38 +01:00
Pau Pérez Fabregat
b443f5ece9
Merge pull request #3789 from hughbric/remove_payment_enterprise_id_refs
...
references to payment_enterprise_id removed, new migration created
2019-05-05 12:30:19 +01:00
Matt-Yorkley
dee9521f77
shipping_category now required for products
2019-05-05 12:00:46 +01:00
Luis Ramos
17f126d80c
Merge pull request #3788 from stveep/3249-display-name-on-edit-variant-page
...
Add display_name and display_as to admin edit variant page
2019-05-05 11:31:27 +01:00
jazzdragon
37d15a1be3
Add classes to indicate collapsible is for medium screens or smaller
2019-05-04 20:12:12 -07:00
jazzdragon
623471290e
Make sure styling doesn't get messed up if resizing down and back up
2019-05-04 19:52:08 -07:00
jazzdragon
a876f81f0a
Make collapsible always visible on large screen
2019-05-04 19:48:30 -07:00
jazzdragon
271330d2fc
Add collapsible elements and styles
2019-05-04 19:43:46 -07:00
stveep
7090281da5
Reorganise defaces so that display name fields come first
2019-05-04 21:48:32 +01:00
Pau Pérez Fabregat
958b144948
Merge pull request #3787 from eelcodevlieger/issue_3777-Make_all_map_icons_green
...
issue 3777 - Make all map icons green
2019-05-04 19:54:02 +02:00
stveep
a959702905
Add display_name and display_as to admin edit variant page
2019-05-04 17:20:12 +01:00
Michael Hughes
9e56198092
references to payment_enterprise_id removed, new migration created
2019-05-04 16:32:48 +01:00
Eelco de Vlieger
4b2114c1e4
issue 3777 - Make all map icons green
2019-05-04 14:44:16 +01:00
kkoomin
f65ce82778
changed string into translation key & add 'infinity' key
2019-05-04 14:40:45 +01:00
Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Luis Ramos
4afa0cdca1
Merge pull request #3589 from kristinalim/fix/2788-ship_address_changed
...
2788 [Subscriptions] Fix address issues when syncing subscriptions and orders
2019-05-03 23:48:32 +01:00
Luis Ramos
637e99367d
Merge pull request #3747 from luisramos0/2-0-vo-ctrl-bug
...
[Spree Upgrade] Fix bug in Variant Overrides controller
2019-05-02 17:31:13 +01:00
luisramos0
4a9570b1a1
Merge branch '2-0-stable' into fix/2788-ship_address_changed
2019-05-02 16:17:53 +01:00
Luis Ramos
3b2e614c57
Merge pull request #3734 from luisramos0/2-0-validate-distribution
...
Removing a variant from OC will prevent user with that variant in the cart from checking out
2019-05-02 16:12:41 +01:00
Luis Ramos
edaf2479dc
Merge pull request #3741 from luisramos0/2-0-stable-Apr15
...
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
2019-05-02 11:26:54 +01:00
luisramos0
340cbe5947
Eager load variants with variant overrides to avoid n+1 in the following line
2019-05-02 11:10:53 +01:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
Kristina Lim
19726061e4
Make Order#address_from_distributor public
2019-05-01 07:17:50 +08:00
Kristina Lim
92dc43d7a2
Make OrderUpdater#shipping_address_from_distributor public
2019-05-01 07:16:56 +08:00
Kristina Lim
0933d53134
Extract method OrderSyncer#update_ship_address_for
2019-05-01 07:16:56 +08:00
