raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,188 Commits 16 Branches 456 Tags
f7124ee32734a16f3cd90d0516428f3b0220aee9
Commit Graph

22188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nihal M. Kelanthodika
f7124ee327 Add business address form feature spec 2021-10-06 15:06:57 +05:30
Nihal M. Kelanthodika
c632442466 Update unused company field to 'unused' 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
b0dcf47481 Add translation for "Reset Form" button 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
06344ed7c4 Remove comments 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
aa58318723 Create a Reset form button that destroy the form itself 
- Thanks to the input hidden field. Its value is false, but when clicking on Reset form, this value changes to 'true' (and then the form is cleared)
 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
9b6cc187b6 Remove clear form checkbox (used via _destroy) 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
802c5c8c94 Create a secondary form button 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
786b198f4d Create an updateinput controller 
- that update the targets input value to the value stored in data attribute
 - Add tests
 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
49e93a6125 Add StimulusJS controllers via webpacker for the admin 2021-10-06 15:06:56 +05:30
Nihal
f6e66de52b Update phone validation to simple validation 2021-10-06 15:06:56 +05:30
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
90038ff250 Add test coverage for business_address association in enterprise model 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
e3307fd341 Migration to add business_address_id to enterpries 2021-10-06 15:06:50 +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
Matt-Yorkley
b53047e0e3 Merge pull request #8287 from mkllnk/fix-variant-filter 
Catch JS error on OC page
 2021-10-06 10:35:02 +02: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
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
c8419940bf Merge pull request #8264 from filipefurtad0/orders_spec_update_2 
Orders spec update
 2021-10-05 15:50:03 -07:00
Andy Brett
4169faccf9 Merge pull request #8283 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.4 
Bump mrujs from 0.5.3 to 0.5.4
 2021-10-05 15:35:34 -07:00
Maikel
ddd0034fff Merge pull request #8267 from filipefurtad0/fix_negative_assertion 
Switches assertion order
 2021-10-06 09:33:30 +11:00
filipefurtad0
18ff3f52b7 Moves spec from feature into system folder 2021-10-06 09:15:02 +11:00
filipefurtad0
076907d56b Changes spec config from feature into system 2021-10-06 09:15:02 +11:00
filipefurtad0
5c881431d3 Switches assertions order 2021-10-06 09:15:02 +11: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
Andy Brett
ce63d02a3d Merge pull request #8262 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.4 
Bump jest from 27.2.3 to 27.2.4
 2021-10-05 14:42:14 -07:00
Matt-Yorkley
19daf1d2fb Update adjustment unit tests 2021-10-05 22:40:37 +01:00
dependabot[bot]
765b6831a9 Bump mrujs from 0.5.3 to 0.5.4 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.5.3 to 0.5.4.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.5.3...v0.5.4)

---
updated-dependencies:
- dependency-name: mrujs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-05 21:39:40 +00:00
Andy Brett
c2c9684e66 Merge pull request #8240 from mkllnk/fix-serializer-spec 
Load referenced lib class for independent spec run
 2021-10-05 14:34:40 -07:00