Skip to content

Store v3 HW #49

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open

Store v3 HW #49

wants to merge 67 commits into from

Conversation

FrankyWu
Copy link

settingslogic 測試失敗 其他的部分都跟者做一次過了

FrankyWu and others added 30 commits June 9, 2014 20:39
新贈後台
3dee1df
加上test.todo加上test.todo加上test.todo加上test.todo加上test.todo加上test.todo加上t…
ff97964 
…est.todo加上test.todo
管理者後台 可以新增產品 完成
c582d0f
管理者全縣完成
b248eed
week1
c68b5bd
@FrankyWu
修正controller
80787ad
@FrankyWu
修正 controller 開始設計圖片上傳功能
2018631
@FrankyWu
圖片上傳功能在product/new OK
4b9b44e
@FrankyWu
carrierwave done
7fd4801
@FrankyWu
CRUD done
61de42c
@FrankyWu
Merge branch 'feature/f1_image_upload' into develop
57b45c4
@FrankyWu
Ready push to heroku
b02a1a8
@noni2she
將按鈕由藍色改成綠色
6c7f6be
@FrankyWu
Merge pull request #1 from noni2she/develop
ae474d9 
將按鈕由藍色改成綠色
@FrankyWu
首頁建立 done
00f0c3d
@FrankyWu
Nav bar done
a99be08
@FrankyWu
排版設定完成
732fd01
@FrankyWu
測試 gitignore
ffc0e7e
@FrankyWu
測試 gitignore part2
2c17d7d
@FrankyWu
測試 gitignore part3
573d1c9
@FrankyWu
nav partial
959da32
@FrankyWu
Ready push to heroku
990becc
@noni2she @FrankyWu
將按鈕由藍色改成綠色
f48fd15
@FrankyWu
首頁建立 done
356b36d
@FrankyWu
Nav bar done
1a6686b
@FrankyWu
排版設定完成
b0fab97
@FrankyWu
測試 gitignore
1e85cc8
@FrankyWu
測試 gitignore part2
3504bd3
@FrankyWu
測試 gitignore part3
d90a58f
@FrankyWu
nav partial
f3692de
FrankyWu added 30 commits June 18, 2014 17:11
@FrankyWu
身為消費者，我要將商品加到購物車後，NAV_bar要可以顯示購物車中的商品數量 @done (14-06-18 17:10)
b16476b
@FrankyWu
身為消費者，我要可以從購物車內刪掉某些物品 @done (14-06-19 10:13)
4f09215
@FrankyWu
身為消費者，我要可以在購物車頁清空購物車的商品 @done (14-06-19 11:26)
ab55aa3
@FrankyWu
add quantity to cart_items
8c984fc
@FrankyWu
身為消費者，我要在前台能夠將多樣商品加到購物車，並生成一張訂單 @done (14-06-19 17:41)
05f33ad
@FrankyWu
fix application
8ba3d97
@FrankyWu
fix application part2
5d80004
@FrankyWu
身為消費者，我可以在購物車中選擇我要買某些物品的數量 @done (14-06-20 15:07)
ffaedac
@FrankyWu
身為消費者，我可以看到我購物車的總價 （小計 x 數量） @done (14-06-20 16:28)
d6c3656 
身為消費者，我在購物時數量為0的貨物不能買 @done (14-06-20 16:28)
@FrankyWu
身為消費者，當系統生成一張訂單後，我可以填寫寄送資訊，並且用信用卡結賬 @done (14-06-20 22:56)
df7b7a9
@FrankyWu
install aasm
6100b68
@FrankyWu
fix order quantity
e78b7e9
@FrankyWu
身為消費者，可看到過去所有訂單(orders) @done (14-06-21 21:40)
f1cde37
@FrankyWu
身為消費者，在結賬完後，會自動跳到訂單的管理界面 @done (14-06-21 22:19)
1b3580a
@FrankyWu
✔ 身為管理者，可以在後台看到所有訂單 @done (14-06-21 22:47)
7652e78 
✔ 訂單狀態分為未結賬 已結賬 出貨中 已出貨 辦理退貨 @done (14-06-21 22:47)
@FrankyWu
fix _nav
8b228b5
@FrankyWu
身為管理者，可以在後台對單張訂單做狀態改變
dde919c
@FrankyWu
fix admin/new.html.erb
c23005f
@FrankyWu
Merge branch 'feature/week-2' into develop
cff93a5
@FrankyWu
Merge branch 'develop'
198c337 
Conflicts:
	app/views/layouts/application.html.erb
@FrankyWu
fix bootstrap simple_form
1ef776c
@FrankyWu
身為消費者，當我用信用卡結賬後，我的信箱要能收到一張訂單確認信 @done (14-06-24 16:49)
5ec30e2 
Stripe finish
Mailgun finish
@FrankyWu
test mailgun on heroku
a141601
@FrankyWu
add new functions
5281cb9
@FrankyWu
test inheritance
cd417cd
@FrankyWu
test mix for model
f50939e
@FrankyWu
service object
26a9aff
@FrankyWu
install setting logic
b5002a1
@FrankyWu
extract to stripe charger service
5b712c8
@FrankyWu
身為消費者，我可以搜尋產品的資料(ransack) @done (14-06-30 13:56)
04f5cfe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FrankyWu @noni2she