12_generate_custom_csv_file #58

Open

philipp wants to merge 59 commits from 12_generate_custom_csv_file into develop

philipp commented

2023-02-23 18:26:58 +01:00

Owner

No description provided.

philipp added 5 commits

2023-02-23 18:26:59 +01:00

add modal to choose column order for custom csv file eba84b2e15

add custom_csv_collection to orders helper e540cb1e59

add rute and controller method to orders controller 259d919175

add custom csv to download dropdown ea0fba9010

add functionality to choose column headers + order for custom csv and append order.sum gross&net to custom csv 928a02ed3f

philipp force-pushed 12_generate_custom_csv_file from 928a02ed3f to 690ea875b7

2023-02-23 18:51:26 +01:00

Compare

philipp force-pushed 12_generate_custom_csv_file from 690ea875b7 to 895589c03d

2023-08-23 15:03:10 +02:00

Compare

This pull request has changes conflicting with the target branch.

.rubocop_todo.yml
.ruby-version
Gemfile
Gemfile.lock
app/assets/javascripts/application_legacy.js
app/controllers/home_controller.rb
app/javascript/application.js
app/lib/apple_bar.rb
app/lib/articles_csv.rb
app/lib/bank_account_connector.rb

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request '12_generate_custom_csv_file' (#58) from 12_generate_custom_csv_file into develop

Merge commit body

Reviewed-on: https://git.local-it.org/Foodsoft/foodsoft/pulls/58

Merge pull request '12_generate_custom_csv_file' (#58) from 12_generate_custom_csv_file into develop

Reviewed-on: https://git.local-it.org/Foodsoft/foodsoft/pulls/58

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 12_generate_custom_csv_file:12_generate_custom_csv_file

git switch 12_generate_custom_csv_file

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop

git merge --no-ff 12_generate_custom_csv_file

git switch 12_generate_custom_csv_file

git rebase develop

git switch develop

git merge --ff-only 12_generate_custom_csv_file

git switch 12_generate_custom_csv_file

git rebase develop

git switch develop

git merge --no-ff 12_generate_custom_csv_file

git switch develop

git merge --squash 12_generate_custom_csv_file