@@ -1,5 +1,4 @@ class Address < ActiveRecord::Base - belongs_to :user belongs_to :country belongs_to :state app/models/address.rb @@ -19,7 +19,6 @@ class User < ActiveRecord::Base has_many :orders has_and_belongs_to_many :roles - has_many :addresses def deliver_password_reset_instructions! reset_perishable_token! app/models/user.rb @@ -1,14 +1,6 @@ <% order_form.fields_for :bill_address do |bill_form| %> <h2><%= t("billing_address")%></h2> <div class="inner"> - <div class="saved_addresses"> - <input type="radio" name="bill_address" class="saved_radio" value="1" /> - <label class="saved_label" for="<%= t('saved_address') %>"><%= t('saved_address') %></label> - <select class="billing" id="order_bill_address_id" name="order[bill_address_id]"></select> - <span></span> - </div> - <input type="radio" name="bill_address" class="saved_radio" value="0" /> - <label class="saved_label" for="<%= t("new_address") %>"><%= t("new_address") %></label> <p id="bfname"> <label for="<%= t("first_name") %>"><%= t("first_name") %></label> <%= bill_form.text_field :firstname, :class => 'required' -%><span class="req">*</span> app/views/orders/_billing.html.erb @@ -1,14 +1,6 @@ <% order_form.fields_for :ship_address do |ship_form| %> <h2><%= t("shipping_address")%></h2> - <div class="inner"> - <div class="saved_addresses"> - <input type="radio" name="ship_address" class="saved_radio" value="1" /> - <label class="saved_label" for="<%= t('saved_address') %>"><%= t('saved_address') %></label> - <select class="shipping" id="order_ship_address_id" name="order[ship_address_id]"></select> - <span></span> - </div> - <input type="radio" name="ship_address" class="saved_radio" value="0" style="display:none;"/> - <label class="saved_label" for="<%= t("new_address") %>" style="display:none;"><%= t("new_address") %></label> + <div class="inner"> <p><label for="<%= t("use_billing_address") %>" id="use_billing"><%= t("use_billing_address") %></label><input id="checkout_same_address" name="checkout_same_address" type="checkbox" /></p> <p id="sfname"> <label for="<%= t("first_name") %>"><%= t("first_name") %></label> app/views/orders/_shipping.html.erb @@ -1,5 +1,4 @@ <% content_for :head do %> - <%= javascript_include_tag 'address' %> <%= javascript_include_tag 'checkout' %> <% end %> <div id="ajax_error"></div> @@ -15,6 +14,3 @@ <input type="hidden" id="hidden_bcountry" name="hidden_bcountry" value="<%= @order.bill_address.country_id %>" /> <input type="hidden" id="hidden_sstate" name="hidden_sstate" value="<%= @order.ship_address.state_id || @order.ship_address.state_name %>" /> <input type="hidden" id="hidden_scountry" name="hidden_scountry" value="<%= @order.ship_address.country_id %>" /> -<% if current_user && !current_user.addresses.empty? -%> -<input type="hidden" id="retrieve_addresses" /> -<% end -%> app/views/orders/checkout.html.erb @@ -225,7 +225,6 @@ de: destroy: Entfernen display: Anzeigen edit: Bearbeiten - editing_address: "Edit Address" editing_category: "Kategorie bearbeiten" editing_option_type: "Optionstyp bearbeiten" editing_option_types: "Option bearbeiten" @@ -313,7 +312,6 @@ de: my_orders: "Meine Bestellungen" name: Name new: Neu - new_address: "Add New Address" new_category: "Neue Kategorie" new_credit_card_payment: "Neue Kreditkartenzahlung" new_customer: "Neuer Kunde" @@ -334,7 +332,6 @@ de: new_variant: "Neue Variante" new_zone: "Neue Zone" next: weiter - nickname: Nickname no_items_in_cart: "Keine Artikel im Warenkorb" no_match_found: "Kein Treffer" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ de: sales_totals: "Umsätze Gesamt" sales_totals_description: "" save_preferences: Save Preferences - saved_address: "Use Saved Address" search: Suchen secure_connection_type: Secure Connection Type select: Auswählen config/locales/de.yml @@ -225,7 +225,6 @@ en-GB: destroy: Destroy display: Display edit: Edit - editing_address: "Edit Address" editing_category: "Editing Category" editing_option_type: "Editing Option Type" editing_option_types: "Editing Option Types" @@ -313,7 +312,6 @@ en-GB: my_orders: "My Orders" name: Name new: New - new_address: "Add New Address" new_category: "New category" new_credit_card_payment: "New Credit Card Payment" new_customer: "New Customer" @@ -334,7 +332,6 @@ en-GB: new_variant: "New Variant" new_zone: "New Zone" next: Next - nickname: Nickname no_items_in_cart: "Basket is empty." no_match_found: "No Match Found" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ en-GB: sales_totals: "Sales Totals" sales_totals_description: "Sales Total For All Orders" save_preferences: Save Preferences - saved_address: "Use Saved Address" search: Search secure_connection_type: Secure Connection Type select: Select config/locales/en-GB.yml @@ -225,7 +225,6 @@ en-US: destroy: Destroy display: Display edit: Edit - editing_address: "Edit Address" editing_category: "Editing Category" editing_option_type: "Editing Option Type" editing_option_types: "Editing Option Types" @@ -313,7 +312,6 @@ en-US: my_orders: "My Orders" name: Name new: New - new_address: "Add New Address" new_category: "New category" new_credit_card_payment: "New Credit Card Payment" new_customer: "New Customer" @@ -334,7 +332,6 @@ en-US: new_variant: "New Variant" new_zone: "New Zone" next: Next - nickname: Nickname no_items_in_cart: "" no_match_found: "No Match Found" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ en-US: sales_totals: "Sales Totals" sales_totals_description: "Sales Total For All Orders" save_preferences: Save Preferences - saved_address: "Use Saved Address" search: Search secure_connection_type: Secure Connection Type select: Select config/locales/en-US.yml @@ -332,7 +332,6 @@ es: new_variant: "Nueva Variante" new_zone: "Nueva zona" next: próximo - nickname: Nickname no_items_in_cart: "La cesta está vacía" no_match_found: "No se ha encontrado" no_user_found: "No se ha encontrado ningun usuario con esa direccion de correo" config/locales/es.yml @@ -225,7 +225,6 @@ fr-FR: destroy: Supprimer display: Afficher edit: Editer - editing_address: "Edit Address" editing_category: "Edition de la catégorie" editing_option_type: "Edition du type d'option" editing_option_types: "Edition des types d'options" @@ -313,7 +312,6 @@ fr-FR: my_orders: "Mes commandes" name: Nom new: Nouveau - new_address: "Add New Address" new_category: "Nouvelle categorie" new_credit_card_payment: "Nouveau mode de paiement par carte de crédit" new_customer: "Nouveau client" @@ -334,7 +332,6 @@ fr-FR: new_variant: "Nouvelle gamme" new_zone: "Nouvelle zone" next: Suivant - nickname: Nickname no_items_in_cart: "" no_match_found: "Aucune correspondance trouvée" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ fr-FR: sales_totals: "Total des ventes" sales_totals_description: "Total des ventes pour toutes les commandes" save_preferences: Sauvegarder les préférences - saved_address: "Use Saved Address" search: Rechercher secure_connection_type: Connection de type sécurisée select: Selectionner config/locales/fr-FR.yml @@ -225,7 +225,6 @@ it: destroy: Cancellare display: Visualizza edit: editare - editing_address: "Edit Address" editing_category: "Edita la categoria" editing_option_type: "Editing Option Type" editing_option_types: "Edita l'opzione" @@ -313,7 +312,6 @@ it: my_orders: "My Orders" name: Name new: New - new_address: "Add New Address" new_category: "Nuova categoria" new_credit_card_payment: "New Credit Card Payment" new_customer: "New Customer" @@ -334,7 +332,6 @@ it: new_variant: "Nuova variante" new_zone: "New Zone" next: continua - nickname: Nickname no_items_in_cart: "Carrello vuoto" no_match_found: "No Match Found" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ it: sales_totals: "Vendite totali" sales_totals_description: "Sales Total For All Orders" save_preferences: Save Preferences - saved_address: "Use Saved Address" search: Cerca secure_connection_type: Secure Connection Type select: Seleziona config/locales/it.yml @@ -225,7 +225,6 @@ nb-NO: destroy: Fjern display: Vis edit: Endre - editing_address: "Edit Address" editing_category: "Endre kategori" editing_option_type: "Endre variasjonstype" editing_option_types: "Endre variasjonstyper" @@ -313,7 +312,6 @@ nb-NO: my_orders: "Mine ordrer" name: Navn new: Ny - new_address: "Add New Address" new_category: "Ny kategori" new_credit_card_payment: "Ny kortbetaling" new_customer: "Ny kunde" @@ -334,7 +332,6 @@ nb-NO: new_variant: "Ny variant" new_zone: "Ny sone" next: Neste - nickname: Nickname no_items_in_cart: "Ingen artikler i handlekurven" no_match_found: "Ingen treff" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ nb-NO: sales_totals: "Omsetning" sales_totals_description: "Totale salg for alle ordrer" save_preferences: "Lagre preferanser" - saved_address: "Use Saved Address" search: Søk secure_connection_type: "Kryptert forbindelse" select: Velg config/locales/nb-NO.yml @@ -225,7 +225,6 @@ nl-BE: destroy: Verwijder display: Weergeven edit: Wijzig - editing_address: "Edit Address" editing_category: "Wijzig Categorie" editing_option_type: "Optie Type Wijzigen" editing_option_types: "Optie Types Wijzigen" @@ -313,7 +312,6 @@ nl-BE: my_orders: "Mijn Bestellingen" name: Naam new: Nieuw - new_address: "Add New Address" new_category: "Nieuwe categorie" new_credit_card_payment: "Nieuwe Kredietkaart betaling" new_customer: "Nieuwe Klant" @@ -334,7 +332,6 @@ nl-BE: new_variant: "Nieuwe Variant" new_zone: "Nieuwe Zone" next: Volgende - nickname: Nickname no_items_in_cart: "Geen producten in Winkelmandje" no_match_found: "Geen gelijke gevonden" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ nl-BE: sales_totals: "Omzet" sales_totals_description: "Omzet voor alle bestellingen" save_preferences: "Instellingen Opslaan" - saved_address: "Use Saved Address" search: Zoek secure_connection_type: "Secure Connection Type" select: Selecteer config/locales/nl-BE.yml @@ -225,7 +225,6 @@ pl: destroy: Usuń display: Wyświetl edit: Edytuj - editing_address: "Edit Address" editing_category: "Edycja kategorii" editing_option_type: "Editing Option Type" editing_option_types: "Edycja typów opcji" @@ -313,7 +312,6 @@ pl: my_orders: "My Orders" name: Name new: New - new_address: "Add New Address" new_category: "Nowa kategoria" new_credit_card_payment: "New Credit Card Payment" new_customer: "New Customer" @@ -334,7 +332,6 @@ pl: new_variant: "Nowy wariant" new_zone: "Nowa Strefa" next: Następne - nickname: Nickname no_items_in_cart: "Koszyk jest pusty" no_match_found: "No Match Found" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ pl: sales_totals: "Sales Totals" sales_totals_description: "Sales Total For All Orders" save_preferences: Save Preferences - saved_address: "Use Saved Address" search: Szukaj secure_connection_type: Secure Connection Type select: Wybierz config/locales/pl.yml @@ -225,7 +225,6 @@ pt-BR: destroy: Destruir display: Mostrar edit: Editar - editing_address: "Edit Address" editing_category: "Editando Categoria" editing_option_type: "Editando Tipo de Opção" editing_option_types: "Editando Tipos de Opção" @@ -313,7 +312,6 @@ pt-BR: my_orders: "Meus Pedidos" name: Nome new: Novo - new_address: "Add New Address" new_category: "Nova categoria" new_credit_card_payment: "Novo Pagamento de Cartão de Crédito" new_customer: "Novo Cliente" @@ -334,7 +332,6 @@ pt-BR: new_variant: "Nova Variante" new_zone: "Nova Zona" next: Próximo - nickname: Nickname no_items_in_cart: "Nr. de itens no carrinho" no_match_found: "Nada encontrado" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ pt-BR: sales_totals: "Total de Vendas" sales_totals_description: "Total de Vendas para todos os Pedidos" save_preferences: Gravar Preferências - saved_address: "Use Saved Address" search: Pesquisa secure_connection_type: Tipo de Conexão Segura select: Selecionar config/locales/pt-BR.yml @@ -225,7 +225,6 @@ pt-PT: destroy: Destruir display: Mostrar edit: Editar - editing_address: "Edit Address" editing_category: "Editando Categoria" editing_option_type: "Editando Tipo de Opção" editing_option_types: "Editando Tipos de Opção" @@ -313,7 +312,6 @@ pt-PT: my_orders: "As Minhas Encomendas" name: Name new: New - new_address: "Add New Address" new_category: "Nova categoria" new_credit_card_payment: "Novo Pagamento por Cartão de Credito" new_customer: "Novo Cliente" @@ -334,7 +332,6 @@ pt-PT: new_variant: "Nova Variante" new_zone: "Nova Zona" next: Próximo - nickname: Nickname no_items_in_cart: "Nr. de itens no carro" no_match_found: "Não encontrado" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ pt-PT: sales_totals: "Total de Vendas" sales_totals_description: "Total de Vendas para todos os Pedidos" save_preferences: Save Preferences - saved_address: "Use Saved Address" search: Pesquisa secure_connection_type: Secure Connection Type select: Selecionar config/locales/pt-PT.yml @@ -225,7 +225,6 @@ ru-RU: destroy: Удалить display: Показать edit: Редактировать - editing_address: "Edit Address" editing_category: "Редактирование категории" editing_option_type: "Редактирование типа опции" editing_option_types: "Редактирование типов опций" @@ -313,7 +312,6 @@ ru-RU: my_orders: "Мои заказы" name: Название new: Новый - new_address: "Add New Address" new_category: "Новая категория" new_credit_card_payment: "Новый платеж по кредитной карте" new_customer: "Для новых пользователей" @@ -334,7 +332,6 @@ ru-RU: new_variant: "Новый вариант" new_zone: "Новая зона" next: След. - nickname: Nickname no_items_in_cart: "" no_match_found: "Совпадений не найдено" no_user_found: "No user was found with that email address" @@ -413,7 +410,6 @@ ru-RU: sales_totals: "Sales Totals ??" sales_totals_description: "Sales Total For All Orders ??" save_preferences: Сохранить настройки - saved_address: "Use Saved Address" search: Поиск secure_connection_type: Тип защищенного соединения select: Выбрать config/locales/ru-RU.yml @@ -37,7 +37,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :tax_categories map.resources :countries, :has_many => :states, :only => :index map.resources :states, :only => :index - map.resources :users, :has_many => :addresses + map.resources :users map.resources :products, :member => {:change_image => :post} map.resources :addresses map.resources :orders, :member => {:address_info => :get, :checkout => :any}, :has_many => [:line_items, :creditcards, :creditcard_payments] config/routes.rb @@ -1,4 +1,5 @@ -frank_ship_address: +<% 1.upto(30) do |i| %> +frank_ship_address_<%= i %>: firstname: Betty lastname: Bar address1: 123 Foo St. @@ -8,10 +9,9 @@ frank_ship_address: zipcode: 16804 country_id: 214 phone: 614-555-1212 - nickname: Ship to Betty - active: 1 - user: frank -frank_bill_address: +<% end %> +<% 1.upto(30) do |i| %> +frank_bill_address_<%= i %>: firstname: Frank lastname: Foo address1: 123 Foo St. @@ -21,6 +21,4 @@ frank_bill_address: zipcode: 16804 country_id: 214 phone: 614-555-1212 - nickname: Bill to Frank - active: 1 - user: frank +<% end %> db/sample/addresses.yml @@ -7,5 +7,5 @@ card_<%= i %>: first_name: Sean last_name: Schofield order: order_<%= i %> - address: frank_bill_address -<% end %> + address: frank_bill_address_<%= i %> +<% end %> \ No newline at end of file db/sample/creditcards.yml @@ -8,8 +8,8 @@ order_<%= i %>: item_total: 37.97 total: 45.75 ip_address: 127.0.0.1 - checkout_complete: true - email: frank.foo@example.com - ship_address: frank_ship_address - bill_address: frank_bill_address -<% end %> + checkout_complete: true + ship_address: frank_ship_address_<%= i %> + bill_address: frank_bill_address_<%= i %> + email: frank.foo@example.com +<% end %> \ No newline at end of file db/sample/orders.yml @@ -3,5 +3,5 @@ shipment_<%= i %>: number: <%= Array.new(11){rand(11)}.join %> order: <%= "order_#{i}" %> shipping_method: ups_ground - address: frank_ship_address -<% end %> + address: frank_ship_address_<%= i %> +<% end %> \ No newline at end of file db/sample/shipments.yml @@ -11,8 +11,8 @@ module Spree::Checkout @order.update_attributes(params[:order]) # additional default values needed for checkout - @order.bill_address ||= params[:order] && params[:order][:bill_address_id] ? Address.find(params[:order][:bill_address_id]) : Address.new(:country => @default_country) - @order.ship_address ||= params[:order] && params[:order][:ship_address_id] ? Address.find(params[:order][:ship_address_id]) : Address.new(:country => @default_country) + @order.bill_address ||= Address.new(:country => @default_country) + @order.ship_address ||= Address.new(:country => @default_country) if @order.creditcards.empty? @order.creditcards.build(:month => Date.today.month, :year => Date.today.year) end lib/spree/checkout.rb app/controllers/addresses_controller.rb app/helpers/addresses_helper.rb app/views/addresses/_form.html.erb app/views/addresses/edit.html.erb app/views/addresses/index.html.erb app/views/addresses/new.html.erb app/views/shared/_address.html.erb app/views/shared/_address_display.html.erb db/migrate/20090406174646_refactor_addresses_user_nickname.rb public/javascripts/address.js public/javascripts/address_book.js f34ae6f7a79f69339a90e778351247decdf8e8e2 Stephanie Powell steph@The-Laptop.(none) http://github.com/akitaonrails/spree/commit/c2d179198a2ead0c3a788d01c1891e40054a5114 c2d179198a2ead0c3a788d01c1891e40054a5114 2009-04-24T11:13:17-07:00 2009-04-24T11:13:17-07:00 Removing address book stuff. 0e8f89e2266163ea97948725fefc73c07c8c475c Stephanie Powell steph@The-Laptop.(none)