Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mvl update orderitem #23

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
8eb5248
Initial Rails setup
scottzec Nov 16, 2020
5342980
Set up models and controllers, updated routes, added seed file
roshni-patel Nov 18, 2020
1ad8efb
created CRUD except delete, not sure needed, some notes included on o…
scottzec Nov 18, 2020
43e5efb
set up oauth and login method for merchant
ghostfruitleaf Nov 18, 2020
6ceaa6e
added logout function
ghostfruitleaf Nov 18, 2020
bcfe9d0
added show and index functions, still need edit/update and require lo…
ghostfruitleaf Nov 18, 2020
fa4f5b2
empty method for remaining functions made, still need require login c…
ghostfruitleaf Nov 18, 2020
5849047
Starting to work on orders controller
roshni-patel Nov 18, 2020
d601b4c
created orderitem_controler, created CRUD actions for orderitem, adde…
mvlofthus Nov 18, 2020
72097fb
fixed a few typos
mvlofthus Nov 18, 2020
5e706bc
added require login controller filter and edit/update and dashboard f…
ghostfruitleaf Nov 18, 2020
e29d8e4
created views to test merchant controller functions
ghostfruitleaf Nov 18, 2020
3da6ccf
moved merchant view to correct directory
ghostfruitleaf Nov 18, 2020
4174001
some views and tests for functions that don't require login
ghostfruitleaf Nov 19, 2020
af3fe8b
Updated some methods, unclear on a few things
roshni-patel Nov 19, 2020
dd4d3e5
minor edit to initializer to add two options for when oauth is implem…
ghostfruitleaf Nov 19, 2020
d27b2c0
Merge pull request #3 from scottzec/merchant-controller-and-tests
ghostfruitleaf Nov 19, 2020
3ae924b
Merge pull request #4 from scottzec/orders_controller
roshni-patel Nov 19, 2020
2f82e4f
changed error flash to warning flash
ghostfruitleaf Nov 19, 2020
b73d654
changed routes and added nested orderitem to rproducts routes
scottzec Nov 19, 2020
d25e9f7
Merge pull request #2 from scottzec/mvl-order-item
mvlofthus Nov 19, 2020
64bbda6
Merge pull request #1 from scottzec/product-crud
scottzec Nov 19, 2020
89eebdd
Merge branch 'master' of https://github.com/scottzec/betsy into merch…
ghostfruitleaf Nov 19, 2020
a15eb5c
added username validation
ghostfruitleaf Nov 19, 2020
0e799cc
migration relate products to merchants
scottzec Nov 19, 2020
913d1e7
commented out pseudo code for merchant model
ghostfruitleaf Nov 19, 2020
be59ced
Merge branch 'master' of https://github.com/scottzec/betsy into categ…
ghostfruitleaf Nov 19, 2020
511a2ad
default image added and show view added
ghostfruitleaf Nov 19, 2020
e39c08b
adding user specific functions to merchant views
ghostfruitleaf Nov 19, 2020
d819deb
refining view
ghostfruitleaf Nov 19, 2020
c63858b
new methods and blank view pages for categories
ghostfruitleaf Nov 19, 2020
77bdd31
made form to create new category
ghostfruitleaf Nov 19, 2020
758f3b6
added navigation for categories, products, merchants, fixed categorie…
ghostfruitleaf Nov 19, 2020
b09db45
fixed category/product relations, working on show view for categories
ghostfruitleaf Nov 19, 2020
38d428f
added partial views
ghostfruitleaf Nov 19, 2020
f532c28
added an end to products#update method
ghostfruitleaf Nov 19, 2020
b3dff89
added an end to products#update method
ghostfruitleaf Nov 19, 2020
050945e
added some document for oauth related testing
ghostfruitleaf Nov 19, 2020
d79e25d
show and index tests working for category
ghostfruitleaf Nov 19, 2020
e4de150
creating views for review and product (for testing purposes ONLY)
ghostfruitleaf Nov 19, 2020
2341152
hipster styling of flash messages :D
ghostfruitleaf Nov 19, 2020
25cd9c0
cleaning up some merchant views and getting working new view for reviews
ghostfruitleaf Nov 19, 2020
dc9ff28
set up review controller tests
ghostfruitleaf Nov 19, 2020
6483027
fixed product relations, added temp views to test categories and revi…
ghostfruitleaf Nov 19, 2020
b399b14
destroy added
scottzec Nov 19, 2020
2b1adbd
add merchant to product create action
scottzec Nov 19, 2020
ef12132
added products index view
scottzec Nov 19, 2020
75f8cdd
working out confusing bits with orderitem, corrected orderitem_contro…
mvlofthus Nov 19, 2020
10894b9
review controller tests working, need refactor for validations/oauth
ghostfruitleaf Nov 19, 2020
a44a4d6
as far as I can get on orderitems solo
mvlofthus Nov 19, 2020
db91d94
just need to add create tests to categories and get login related tes…
ghostfruitleaf Nov 19, 2020
056d07c
index view product
scottzec Nov 19, 2020
14b2e37
added create tests for category
ghostfruitleaf Nov 19, 2020
8132b2c
Updated routes, added order items and orders seed files, added some o…
roshni-patel Nov 20, 2020
cf165e1
Merge branch 'master' into orders_controller
roshni-patel Nov 20, 2020
cb09e1b
Merge pull request #6 from scottzec/orders_controller
roshni-patel Nov 20, 2020
d2d4fe9
Merge branch 'master' into mvl-orderitem-views-tests
mvlofthus Nov 20, 2020
3028e97
Merge pull request #8 from scottzec/mvl-orderitem-views-tests
mvlofthus Nov 20, 2020
5b10d20
Merge pull request #7 from scottzec/products-controller-views
scottzec Nov 20, 2020
d1dc0fe
Merge branch 'master' into categories-reviews-and-merchant-views
ghostfruitleaf Nov 20, 2020
abb58ce
Merge pull request #5 from scottzec/categories-reviews-and-merchant-v…
ghostfruitleaf Nov 20, 2020
96b0f2e
removed syntax error
scottzec Nov 20, 2020
cdb2221
added shipped/status column to orderitem
mvlofthus Nov 20, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore uploaded files in development.
/storage/*
!/storage/.keep

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

# ignore dotenv file
.env
8 changes: 8 additions & 0 deletions .idea/.generators

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/.rakeTasks

Large diffs are not rendered by default.

150 changes: 150 additions & 0 deletions .idea/betsy.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
Loading