update from server@cht.local
Merge branch 'cht.local' into cht
Revert "購物車列表顯示dialog"

This reverts commit 031e0bd0fe09e1538d11d966bc3cc01a775636de.

Conflicts:
	cart/templates/ws-cart-tpl.html
調整到貨時間為4天
Merge branch 'cht.local' into cht