raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,492 Commits 18 Branches 452 Tags
d46ed5969900a0795795063dd3ba1398091d3fb3
Commit Graph

22492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
d46ed59699 Remove preference from Enterprise class 2021-11-04 11:48:30 +00:00
Matt-Yorkley
cf5d964133 Update usages of old preference getters and setters 2021-11-04 11:48:30 +00:00
Matt-Yorkley
4f5c266356 Add migration unit test 2021-11-04 11:48:30 +00:00
Matt-Yorkley
6f5cd98b1b Migrate preference to enterprises table 2021-11-04 11:48:30 +00:00
Matt-Yorkley
cfc2f2717c Merge pull request #8436 from Matt-Yorkley/drop-source-columns 
Drop source_id and source_type columns from spree_adjustments
 2021-11-04 11:39:48 +00:00
Rachel Arnould
761c2708c4 Update README.md 2021-11-03 15:14:08 +01:00
Matt-Yorkley
68542ce2b6 Merge pull request #8437 from Matt-Yorkley/statemachines-warnings 
Ignore StateMachines warnings in console output
 2021-11-03 09:29:00 +00:00
Matt-Yorkley
cf64128d54 Update db/migrate/20211029174211_drop_source_columns.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-11-03 09:26:47 +00:00
Matt-Yorkley
1b471aca4b Merge pull request #8430 from Matt-Yorkley/remove-codecov 
Remove Codecov
 2021-11-03 09:25:40 +00:00
Maikel
1cef0dd2ac Merge pull request #8428 from Matt-Yorkley/enterprise-dead-code 
Remove Enterprise #inheritance_column
 2021-11-03 17:29:42 +11:00
Matt-Yorkley
39c4d787b1 Merge pull request #8440 from filipefurtad0/admin_into_system 
Admin into system
 2021-11-02 19:22:13 +00:00
Matt-Yorkley
f90b7d5226 Merge pull request #8444 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.7 
Bump karma from 6.3.6 to 6.3.7
 2021-11-02 10:41:00 +00:00
dependabot[bot]
267e0b856b Bump karma from 6.3.6 to 6.3.7 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.6 to 6.3.7.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.6...v6.3.7)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-02 09:05:29 +00:00
filipefurtad0
97859aa58a Changes assertion to consider slow progress bar 2021-11-01 19:21:48 +00:00
filipefurtad0
94ad5d3c74 Changes fixture path to absolute path 2021-11-01 19:20:45 +00:00
filipefurtad0
efec88a4fe Moves/updates product_import into system 2021-11-01 19:19:20 +00:00
filipefurtad0
bcb964648f Moves/updates payments_stripe into system 2021-11-01 18:32:16 +00:00
filipefurtad0
aa87d21e6a Moves/updates payments_spec into system 2021-11-01 18:29:42 +00:00
filipefurtad0
d0eec31503 Moves/updates payment_method_spec spec into system 2021-11-01 17:53:47 +00:00
filipefurtad0
d6a1c6aa1f Moves/updates overview_spec spec into system 2021-11-01 17:48:24 +00:00
filipefurtad0
0a14da59d5 Adds js wait line to reduce flakiness 2021-11-01 17:42:41 +00:00
filipefurtad0
a179acff2a Moves/updates order_spec spec into system 2021-11-01 17:41:05 +00:00
filipefurtad0
7e6dea4970 Moves/updates order_print spec into system 2021-11-01 15:34:20 +00:00
filipefurtad0
f68f13155d Adds missing helper to base_spec_helper.rb 2021-11-01 15:31:07 +00:00
filipefurtad0
a8889cb96c Moves/updates OC complex_nav into system 2021-11-01 15:01:01 +00:00
filipefurtad0
71b4a7d38e Moves/updates multilingual_spec into system 2021-11-01 14:57:58 +00:00
Matt-Yorkley
636ca9987a Ignore StateMachines warnings in console output 
We *already* ignore them anyway, so this just removes the console noise.
 2021-10-29 18:59:08 +01:00
Matt-Yorkley
1007d7afdf Drop source_id and source_type columns from spree_adjustments 
These are no longer used
 2021-10-29 18:46:53 +01:00
Matt-Yorkley
b0545c7fd3 Merge pull request #8431 from filipefurtad0/admin_specs_into_system 
Admin enterprise specs into system
 2021-10-29 16:10:31 +01:00
Matt-Yorkley
d75ebb8dab Merge pull request #8419 from drummer83/master 
Added blank space in "Address (contd.)"
 2021-10-29 16:09:01 +01:00
Matt-Yorkley
fafbc1c3cb Merge pull request #8410 from openfoodfoundation/dependabot/bundler/capybara-3.36.0 
Bump capybara from 3.35.3 to 3.36.0
 2021-10-29 14:45:38 +01:00
Matt-Yorkley
64d368a960 Merge pull request #8424 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.11 
Bump mrujs from 0.5.10 to 0.5.11
 2021-10-29 14:40:20 +01:00
filipefurtad0
a1b094b015 Uses trigger.click to click elements outside visible area 2021-10-29 14:28:16 +01:00
filipefurtad0
ace761464e Moves/updates enteprises_spec into system 2021-10-29 14:28:16 +01:00
filipefurtad0
a11cd901af Moves/updates enteprise_user into system 2021-10-29 14:28:16 +01:00
filipefurtad0
222817d317 Moves/updates enteprise_roles into system 2021-10-29 14:28:16 +01:00
filipefurtad0
56888dd6b0 Moves/updates enteprise_relationships into system 2021-10-29 14:28:16 +01:00
filipefurtad0
6c24708aec Moves/updates enteprise_groups_spec into system 2021-10-29 14:28:16 +01:00
Matt-Yorkley
1942af4bb6 Update all locales with the latest Transifex translations v4.1.6 2021-10-29 14:23:11 +01:00
Matt-Yorkley
649380a99d Merge pull request #8393 from openfoodfoundation/transifex 
Transifex
 2021-10-29 14:15:12 +01:00
jibees
4447cc19bf Merge pull request #8432 from Matt-Yorkley/split-system-tests 
Break up system tests into two jobs
 2021-10-29 14:30:51 +02:00
Matt-Yorkley
1ad1e51bb6 Break up system tests into two jobs 2021-10-29 12:00:45 +01:00
Matt-Yorkley
b898598070 Merge pull request #8411 from openfoodfoundation/dependabot/bundler/pagy-5.1.2 
Bump pagy from 5.1.1 to 5.1.2
 2021-10-29 10:27:17 +01:00
Matt-Yorkley
5316f7cd68 Remove Codecov 
We're still getting build errors related to CodeCov reports not being uploaded
 2021-10-29 10:02:13 +01:00
Maikel
43514f61ea Merge pull request #8312 from mariodz95/8249_fix_snail_on_shipping_method_fees 
Fix snail on shipping method fees
 2021-10-29 12:04:25 +11:00
Maikel
e5c755e6ad Merge pull request #8395 from sinansonmez/7937-include-missing-navigation-for-super-admin-only 
Missing navigation for super admin users only included
 2021-10-29 12:03:48 +11:00
Maikel
03963c8feb Merge pull request #8415 from jibees/add-tax_category_id-to-adjustements 
API: add the tax_category_id for each ajustements of an order
 2021-10-29 12:02:59 +11:00
Maikel
1b79fdd333 Merge pull request #8409 from luisAzcuaga/task/rubocop 
[6055] Task: Run rubocop over existing todo
 2021-10-29 12:01:12 +11:00
Jean-Baptiste Bellet
fc8cd30cce Add the tax_category_id for each adjustement 
- This tax_category_id could be null
 - Special case if the originator is a Spree::TaxRate: then use the tax_category_id of the originator

Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2021-10-28 15:04:43 +02:00
Matt-Yorkley
d1a91a53ea Merge pull request #8365 from lamphanqg/fix_menu_indicator 
Fix menu indicator on bulk order page
 2021-10-28 13:59:32 +01:00