Commit Graph

14886 Commits

Author SHA1 Message Date
Nihal
7eb0c6c33c Add module to set unused ship, bill address fields 2021-10-06 15:06:56 +05:30
Nihal
f72f182363 Redo business_address_empty? method 2021-10-06 15:06:56 +05:30
Nihal
912b869407 Re-order country/state selector 2021-10-06 15:06:56 +05:30
Nihal
5f1a326a05 Add before_validation callback to set unused addressed fields in customer, order, user, subscription, enterprise_group 2021-10-06 15:06:56 +05:30
Nihal
372326debc Updated validation to include phone and edit address_spec to requires phone 2021-10-06 15:06:56 +05:30
Nihal
c120965a8d Fix translations 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
c6219a47c3 Remove stray space 2021-10-06 15:06:56 +05:30
Nihal Mohammed
496319b539 Reject changes to business_address if fields are empty 2021-10-06 15:06:56 +05:30
Nihal Mohammed
a7a45769d6 Update enterprises_controller and schema 2021-10-06 15:06:56 +05:30
Nihal Mohammed
7ef6671e37 Add tooltip for business address
Fix schema
2021-10-06 15:06:56 +05:30
Nihal Mohammed
9cd0314ab3 Fix business address title and border 2021-10-06 15:06:56 +05:30
Nihal Mohammed
1c72cd799d Permit :id attribute in PermittedAttributes:BusinessAddress 2021-10-06 15:06:56 +05:30
Nihal Mohammed
3cd5ed58c0 Add checkbox to clear business_address form 2021-10-06 15:06:56 +05:30
Nihal Mohammed
32d8ce78ef Re-add :country validation to spree_address model 2021-10-06 15:06:56 +05:30
Nihal Mohammed
f5743b3b36 Update invoice templates to use business address when form filled in 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
ed8edf0ab9 Update business_address form
Removes `{ "ng-controller" => "countryCtrl" }` from column element as its now on the parent div.

Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
2021-10-06 15:06:56 +05:30
Matt-Yorkley
8393414bf5 Adapt admin enterprise form handling for both address and business_address 2021-10-06 15:06:56 +05:30
Nihal Mohammed
83524f2285 Update en.yml to include translations for business_address form 2021-10-06 15:06:56 +05:30
Nihal Mohammed
7096667c6f Add business_address form to business details section 2021-10-06 15:06:56 +05:30
Nihal Mohammed
26c7cb2bd3 Fix business_address attribute permissions 2021-10-06 15:06:56 +05:30
Nihal Mohammed
9007418455 Set belongs_to association for business_address and accept nested attributes on enterprise model 2021-10-06 15:06:56 +05:30
Nihal Mohammed
56c02a2e99 Add business_address to build_resource method in enterprise_controller 2021-10-06 15:06:20 +05:30
Nihal Mohammed
783b055d55 Add business address permitted attributes 2021-10-06 15:06:20 +05:30
Maikel Linke
5b9d5a6bce Avoid console error by catching potential fails 2021-10-06 15:51:43 +11:00
Maikel Linke
eb87cdeb1c Enable translation for "Save Changes" on customers page 2021-10-06 15:51:35 +11:00
Maikel Linke
129c4c92fa Catch JS error on OC page
Calling `when variant.id in enterprise_rules` raised an error when
enterprise_rules was null.

Fixing this then revealed a missing require statement in a controller.
2021-10-06 15:29:41 +11:00
Maikel Linke
e41a0504b7 Fix coffescript typo 2021-10-06 15:22:11 +11:00
Maikel Linke
75731ed546 Avoid superfluous permalink check on site load 2021-10-06 15:22:02 +11:00
Andy Brett
7a49b304d1 Merge pull request #8279 from Matt-Yorkley/orphaned-adjustments
Orphaned adjustments handing
2021-10-05 17:19:58 -07:00
Andy Brett
f3ef3bb052 Merge pull request #8270 from achauve/8161-fix-sorting-admin-orders-by-total
Fix sorting admin orders by total
2021-10-05 14:44:59 -07:00
Andy Brett
9b9db3202e Merge pull request #8277 from sinansonmez/8223-remove-ask-checkbox
Ask checkboxes are removed from two pages
2021-10-05 14:44:27 -07:00
Sinan Chaush
01ee2070eb producer id is used to select the producer 2021-10-05 21:35:18 +02:00
Sinan Chaush
771ee7b3dc classes are removed from the texts 2021-10-05 17:30:56 +02:00
Sinan Chaush
2de8ba5e8d make home page labels clickable 2021-10-04 21:11:12 +02:00
Matt-Yorkley
65f08ee8f4 Deal with edge cases where an adjustment is left referencing a deleted item 2021-10-04 17:55:27 +01:00
Sinan Chaush
7dc8500aa9 ask checkbox is removed from two pages 2021-10-04 17:08:32 +02:00
Sinan Chaush
70000db52c when creating a product, preselect the supplier if there is only one 2021-10-03 11:51:41 +02:00
Adrien Chauve
45eefb627d Fix sorting orders by total in admin/ via api/v0/orders 2021-10-01 18:32:59 +02:00
Yasuhiro Yoshida
768acc4166 Add scope to only allow visible enterprises in group 2021-10-01 15:22:00 +03:00
Yasuhiro Yoshida
ace8c8768f Remove ng-if to filter out invisible enterprises from group 2021-10-01 15:21:13 +03:00
Matt-Yorkley
76c9f38fb6 Fix display of "inventory only" radio buttons
Previously the two radio buttons were not showing which option was set; both options were blank even if one had been selected.
2021-09-30 13:30:23 +01:00
Maikel
c9d36e6f5c Merge pull request #8204 from meronokbay/6942-fix-payment-method-fee-bug-all
Fix payment method fee bug for all calculator types
2021-09-28 08:39:05 +10:00
Jean-Baptiste Bellet
78bbee49e9 Search for orders that are finalized
Thus, we display the orders that contains at least one line item (whatever its state) + the finalized orders

NB // Finalized state : complete canceled resumed awaiting_return returned
2021-09-23 11:06:15 +02:00
Maikel
5b5693dc26 Merge pull request #8180 from jibees/7504-resolve-rounded-errors
Avoid rounded with float numbers errors with javascript
2021-09-23 09:56:03 +10:00
Maikel
02a10ede15 Merge pull request #7938 from dacook/product-image-import
Add script to import product images from URL
2021-09-20 16:57:23 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Meron Ogbai
cd992ee866 Validate preferred values all calculators 2021-09-17 18:50:29 +03:00
Meron Ogbai
957f834694 Rename preferred amount to preferred value 2021-09-17 18:49:57 +03:00
Yasuhiro Yoshida
8090945c34 Change visibilities of hubs on group page
Issue:
https://github.com/openfoodfoundation/openfoodnetwork/issues/5106

Hubs on group page for consumers are displayed unconditionally.
But they should only appear under the following conditions: Visible.

In addition, those that are active should only be filled with red color
when they have open order cycles.

This commit apply these rules and changes the visibility of each hub on
"Our Hubs" tab of group page for consumers accordingly.
2021-09-17 17:12:08 +03:00
Meron Ogbai
d73df78f43 Extract gateway_params to a private method 2021-09-17 16:48:53 +03:00