GPL-LICENSE app/models/customer.rb @@ -8,6 +8,7 @@ cache/* config/database.yml coverage gems +nbproject pkg pkg/* tmp .gitignore @@ -1,4 +1,2 @@ = Change Log - -pre-0.1: Changes from Substruct: \ No newline at end of file CHANGELOG @@ -1,37 +1,37 @@ MerbMart README =============== -MerbMart is an *open-source e-commerce engine*, developed on top of the recent -Ruby-language Merb MVC framework. Although MerbMart is designed for e-commerce -sites of all sizes, the speed and scalability of the Merb framework make it -scalable for even large online vendors. - -In addition to Merb framework, MerbMart is also built on the following open- -source foundations: - - * DataMapper (0.9 branch), for object relation mapping (ORM) and persistence. - * RSpec, for behavio(u)r driven development (BDD). - * ActiveMerchant, for Credit Card, payment and shipping processing. +MerbMart is an *open-source e-commerce application*, developed on top of the +recent Ruby-language Merb MVC framework. Although MerbMart is designed for +e-commerce sites of all sizes, the speed and scalability of the Merb framework +make it scalable even for large online vendors. + +In addition to Merb framework, the following technologies and frameworks +provide a foundation for MerbMart: + + * **DataMapper** (bleeding-edge 0.9), for object relation mapping (ORM) and + persistence. + * **RSpec**, for behavio(u)r driven development (BDD). + * **ActiveMerchant**, for Credit Card, payment and shipping processing. as well as attachmerb\_fu, merb\_paginate. See INSTALL or the project wiki for a full list of dependencies. -MerbMart is a loose port of the Substruct e-commerce application for Ruby-on- -Rails. The initial 0.1 release of MerbMart will be a feature-equivalent port -of Substruct 0.97. MerbMart borrows many ideas, its database entity- -relationship design and some lines of code from Substruct, and is grateful to i -ts developers for developing such a great application: - http://code.google.com/p/substruct/ - http://substruct.subimage.com/ +MerbMart is inspired by other, Rails based e-commerce applications, including +[Substruct][substruct] and [Spree][spree]. Although MerbMart started out as a +project to port Substruct to Merb, the initial 0.1 release of MerbMart will +instead be a its own implementation of an e-commerce engine, trying to match +the feature sets other e-commerce applications, but taking advantages of the +unique features of Merb and DataMapper. -Developer ReadMe ----------------- +Developer Notes +--------------- **WARNING** : MerbMart is at a very early development stages. At this stage, the application should be considered only for consumption by advanced Ruby and Merb developers. If you're looking for something for production consumption, or not yet ready to jump from Ruby on Rails, then we would strongly advise -trying Substruct. +trying [Substruct][substruct] or [Spree][spree]. **REQUEST** : Your development support is very much appreciated. Please contact us below if you're interested in lending a hand with the development @@ -61,8 +61,8 @@ MerbMart. Licensing and Copyright ----------------------- -MerbMart is released under the **Artistic License**. Copyright information, -as well as a copy of the Artistic License may be found in the LICENSE file. +This code is licensed under the **GNU Public License (GPL) v2**. Please see +LICENSE for licensing and copyright information. Support ------- @@ -83,4 +83,6 @@ list: * **MerbMart homepage**: _coming soon_ * Contact the developers directly: - <alex@alexcolesportfolio.com> | myabc on #datamapper, #merb IRC - \ No newline at end of file + +[substruct]:http://code.google.com/p/substruct/ "Substruct e-commerce project" +[spree]:http://spreehq.org/ "Spree Online Commerce for Ruby on Rails" README.markdown @@ -1,11 +1,4 @@ -# Represents any type of user upload that's not an image. -# class Asset < UserUpload -# has_attachment :storage => :file_system, -# :max_size => MAX_SIZE, -# :path_prefix => 'public/system/' - -# validates_as_attachment end \ No newline at end of file app/models/asset.rb @@ -1,17 +1,6 @@ -# Represents an image -# class Image < UserUpload one_to_many :product_images one_to_many :products, :through => :product_images -# has_attachment :content_type => :image, -# :storage => :file_system, -# :max_size => MAX_SIZE, -# :thumbnails => { :thumb => '50x50>', :small => '200x200' }, -# :processor => 'MiniMagick', -# :path_prefix => 'public/system/' -# -# validates_as_attachment - end \ No newline at end of file app/models/image.rb @@ -29,612 +29,8 @@ class Order property :shipping_cost, Float, :default => 0.0 property :tax, Float, :default => 0.0, :nullable => false - #property t.string :auth_transaction_id" - #property t.integer :shipping_address_id", :default => 0, :null => false - #property t.integer :billing_address_id", :default => 0, :null => false validates_presence_of :order_number - # FIXME: fix validates_uniqueness_of - #validates_uniqueness_of :order_number - - # CALLBACKS ================================================================= - - # FIXME: callbacks - #before_save :set_product_cost - #before_save :set_promo_code - - # Sets product cost based on line items total before a save. - def set_product_cost - self.product_cost = self.line_items_total - end - - # Modifies the order based on any promotion codes passed in. - # - # This can add discounts to the order or add items. - # - # Returns silently and just doesn't add the promo if something - # is wrong. - # - def set_promo_code - # Find promotion based on code entered - promo = Promotion.first(:code => self.promotion_code) - - # No promo code? Not active? No deal... - return if !promo || !promo.is_active? - - # Make sure it's valid to add - if promo.minimum_cart_value - return if promo.minimum_cart_value > self.total - end - logger.info "PROMO MIN CART VALUE PASSED" - - # Don't allow more than one promotion? - # This destroys any line items created previously. - self.promotion_line_item.destroy if self.promotion_line_item - - # Assign proper promotion ID - self.promotion_id = promo.id - - # Add any line items necessary from promotion. - oli = OrderLineItem.new - logger.info "CREATED OLI" - # Set name & item... - oli.name = promo.description - oli.item_id = promo.item_id - - # Figure out how to apply the promotion - case promo.discount_type - # Dollars - when 0 then - oli.quantity = 1 - oli.unit_price = -promo.discount_amount - # - # Percent - when 1 then - oli.quantity = 1 - oli.unit_price = -(self.total * (promo.discount_amount/100)) - # - # Buy N get 1 free - when 2 then - item = self.order_line_items.detect { |i| i.item_id == promo.item_id } - if item && item.quantity >= promo.discount_amount.to_i - oli.quantity = item.quantity / promo.discount_amount.to_i - logger.info "ITEM QUANTITY #{oli.quantity}" - else - return - end - end - - self.order_line_items << oli - end - - # CLASS METHODS ============================================================= - - # Searches an order - # Uses order number, first name, last name - def self.search(search_term, count=false, limit_sql=nil) - if (count == true) then - sql = "SELECT COUNT(*) " - else - sql = "SELECT DISTINCT orders.* " - end - sql << "FROM orders " - sql << "JOIN order_addresses ON orders.order_user_id = order_addresses.order_user_id " - sql << "WHERE orders.order_number = ? " - sql << "OR order_addresses.first_name LIKE ? " - sql << "OR order_addresses.last_name LIKE ? " - sql << "OR CONCAT(order_addresses.first_name, ' ', order_addresses.last_name) LIKE ? " - sql << "ORDER BY orders.created_on DESC " - sql << "LIMIT #{limit_sql}" if limit_sql - arg_arr = [sql, search_term, "%#{search_term}%", "%#{search_term}%", "%#{search_term}%"] - if (count == true) then - count_by_sql(arg_arr) - else - find_by_sql(arg_arr) - end - end - - # Finds orders by country - # - def self.find_by_country(country_id, count=false, limit_sql=nil) - if (count == true) then - sql = "SELECT COUNT(*) " - else - sql = "SELECT DISTINCT orders.* " - end - sql << "FROM orders " - sql << "INNER JOIN order_users ON order_users.id = orders.order_user_id " - sql << "INNER JOIN order_addresses ON ( " - sql << " order_addresses.country_id = ? AND order_addresses.order_user_id = order_users.id " - sql << ")" - arg_arr = [sql, country_id] - if (count == true) then - count_by_sql(arg_arr) - else - find_by_sql(arg_arr) - end - end - - # Generates a unique order number. - # This number isn't ID because we want to mask that from the customers. - def self.generate_order_number - record = Object.new - while record - random = rand(999999999) - record = first(:conditions => ['order_number = ?', random]) - end - return random - end - - # Returns array of sales totals (hash) for a given year. - # Hash contains - # * :number_of_sales - # * :sales_total - # * :tax - # * :shipping - def self.get_totals_for_year(year) - months = Array.new - 0.upto(12) { |i| - sql = "SELECT COUNT(*) AS number_of_sales, SUM(product_cost) AS sales_total, " - sql << "SUM(tax) AS tax, SUM(shipping_cost) AS shipping " - sql << "FROM orders " - sql << "WHERE YEAR(created_on) = ? " - if i != 0 then - sql << "AND MONTH(created_on) = ? " - end - sql << "AND (order_status_code_id = 5 OR order_status_code_id = 6 OR order_status_code_id = 7) " - sql << "LIMIT 0,1" - if i != 0 then - months[i] = self.find_by_sql([sql, year, i])[0] - else - months[i] = self.find_by_sql([sql, year])[0] - end - } - return months - end - - # Gets a CSV string that represents an order list. - def self.get_csv_for_orders(order_list) - require 'fastercsv' - csv_string = FasterCSV.generate do |csv| - # Do header generation 1st - csv << [ - "OrderNumber", "Company", "ShippingType", "Date", - "BillLastName", "BillFirstName", "BillAddress", "BillCity", - "BillState", "BillZip", "BillCountry", "BillTelephone", - "ShipLastName", "ShipFirstName", "ShipAddress", "ShipCity", - "ShipState", "ShipZip", "ShipCountry", "ShipTelephone", - "Item1", - "Quantity1", "Item2", "Quantity2", "Item3", "Quantity3", "Item4", - "Quantity4", "Item5", "Quantity5", "Item6", "Quantity6", "Item7", - "Quantity7", "Item8", "Quantity8", "Item9", "Quantity9", "Item10", - "Quantity10", "Item11", "Quantity11", "Item12", "Quantity12", "Item13", - "Quantity13", "Item14", "Quantity14", "Item15", "Quantity15", "Item16", - "Quantity16" - ] - for order in order_list - bill = order.billing_address - ship = order.shipping_address - pretty_date = order.created_on.strftime("%m/%d/%y") - if !order.order_shipping_type.nil? - ship_code = order.order_shipping_type.code - else - ship_code = '' - end - order_arr = [ - order.order_number, '', ship_code, pretty_date, - bill.last_name, bill.first_name, bill.address, bill.city, - bill.state, bill.zip, bill.country.name, bill.telephone, - ship.last_name, ship.first_name, ship.address, ship.city, - ship.state, ship.zip, ship.country.name, ship.telephone - ] - item_arr = [] - # Generate spaces for items up to 16 deep - 0.upto(15) do |i| - item = order.order_line_items[i] - if !item.nil? && !item.product.nil? then - item_arr << item.product.code - item_arr << item.quantity - else - item_arr << '' - item_arr << '' - end - end - # Add csv string by joining arrays - csv << order_arr.concat(item_arr) - end - end - return csv_string - end - - # Returns an XML string for each order in the order list. - # This format is for sending orders to Tony's Fine Foods - def self.get_xml_for_orders(order_list) - xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - xml << "<orders>\n" - for order in order_list - if order.order_shipping_type - shipping_type = order.order_shipping_type.code - else - shipping_type = '' - end - #pretty_date = order.created_on.strftime("%m/%d/%y") - pretty_date = order.created_on - xml << " <order>\n" - xml << " <date>#{pretty_date}</date>\n" - xml << " <shippingCode>#{shipping_type}</shippingCode>\n" - xml << " <invoiceNumber>#{order.order_number}</invoiceNumber>\n" - xml << " <emailAddress>#{order.order_user.email_address}</emailAddress>\n" - # Shipping address - address = order.shipping_address - xml << " <shippingAddress>\n" - xml << " <firstName>#{address.first_name}</firstName>\n" - xml << " <lastName>#{address.last_name}</lastName>\n" - xml << " <address1>#{address.address}</address1>\n" - xml << " <address2></address2>\n" - xml << " <city>#{address.city}</city>\n" - xml << " <state>#{address.state}</state>\n" - xml << " <zip>#{address.zip}</zip>\n" - xml << " <countryCode>#{address.country.fedex_code}</countryCode>\n" - xml << " <telephone>#{address.telephone}</telephone>\n" - xml << " </shippingAddress>\n" - # Items - xml << " <items>\n" - for item in order.order_line_items - xml << " <item>\n" - xml << " <name>#{item.product.name}</name>\n" - xml << " <id>#{item.product.code}</id>\n" - xml << " <quantity>#{item.quantity}</quantity>\n" - xml << " </item>\n" - end - xml << " </items>\n" - # End - xml << " </order>\n" - end - # End orders - xml << "</orders>\n" - return xml - end - - - # INSTANCE METHODS ========================================================== - - # Shortcut to find order_line_item for a promotion that has been applied. - def promotion_line_item - if self.promotion - return self.order_line_items.find_by_name(self.promotion.description) - else - return nil - end - end - - # Order status name - def status - code = OrderStatusCode.first(:id => self.order_status_code_id) - code.name - end - - # Shortcut to items - def items - self.order_line_items - end - - # Total for the order, including shipping and tax. - # - def total - logger.info "CALCULATING SHIPPING TOTAL" - logger.info "LINE ITEMS TOTAL: #{self.line_items_total}" - logger.info "SHIPPING COST: #{self.shipping_cost}" - logger.info "TAX COST: #{self.tax_cost}" - self.line_items_total + self.shipping_cost + self.tax_cost - end - - # The tax of items if applied. - # - def tax_cost - (self.line_items_total) * (self.tax/100) - end - - def name - return "#{billing_address.first_name} #{billing_address.last_name}" - end - - def account - self.order_account - end - - # Sets line items from the product output table on the edit page. - # - # Deletes any line items with a quantity of 0. - # Adds line items with a quantity > 0. - # - # This is called from update in our controllers. - # What's passed looks something like this... - # @products = {'1' => {'quantity' => 2}, '2' => {'quantity' => 0}, etc} - def line_items=(products) - # Clear out all line items - self.order_line_items.clear - # Go through all products - products.each do |id, product| - quantity = product['quantity'] - if quantity.blank? then - quantity = 0 - else - quantity = Integer(quantity) - end - - if (quantity > 0) then - new_item = self.order_line_items.build - logger.info("\n\nBUILDING NEW LINE ITEM\n") - logger.info(new_item.inspect+"\n") - new_item.quantity = quantity - new_item.item_id = id - new_item.unit_price = Item[:id].price - new_item.save - end - end - end - - # Do we have a valid transaction id - def contains_valid_transaction_id?() - return (!self.auth_transaction_id.blank? && self.auth_transaction_id != 0) - end - - # Determines if an order has a line item based on product id - def has_line_item?(id) - self.order_line_items.each do |item| - return true if item.id == id - end - return false - end - - # Gets quantity of a product if exists in current line items. - def get_line_item_quantity(id) - self.order_line_items.each do |item| - return item.quantity if item.id == id - end - return 0 - end - - # Gets a subtotal for line items based on product id - def get_line_item_total(id) - self.order_line_items.each do |item| - return item.total if item.id == id - end - return 0 - end - - # Grabs the total amount of all line items associated with this order - def line_items_total - total = 0 - for item in self.order_line_items - total += item.total - end - return total - end - - # Adds a new order note from the edit page. - # - # We display notes as read-only, so we only have to use a text field - # instead of multiple records. - def new_notes=(note) - if !note.blank? then - time = Time.now.strftime("%m-%d-%y %I:%M %p") - new_note = "<p>#{note}<br/>" - new_note << "<span class=\"info\">" - new_note << "[#{time}]" - new_note << "</span></p>" - if self.notes.blank? then - self.notes = new_note - else - self.notes << new_note - end - end - end - - # Calculates the weight of an order - def weight - weight = 0 - self.order_line_items.each do |item| - weight += item.quantity * item.product.weight rescue 0 - end - return weight - end - - # Gets a flat shipping price for an order. - # This is if we're not using live rate calculation usually - # - # A lot of people will want this overridden in their app - def get_flat_shipping_price - return Preference.find_by_name('store_handling_fee').value.to_f - end - - # Gets all LIVE shipping prices for an order. - # - # Returns an array of OrderShippingTypes - def get_shipping_prices - prices = [] - # If they're in the USA - address = self.shipping_address - - # TODO - set this country_id as a preference in the admin UI - # - if address.country_id == 1 then - shipping_types = OrderShippingType.get_domestic - else - shipping_types = OrderShippingType.get_foreign - end - - for type in shipping_types - type.calculate_price(self.weight) - prices << type - end - - return prices - - end - - # Runs an order transaction. - # Farms out the work to an Authorize.net or PayPal method - # (or one of your devising). - # - # Should return TRUE if the process is successful. - # Should return AN ERROR MESSAGE if not... - # - def run_transaction - cc_processor = Order.get_cc_processor - if cc_processor == Preference::CC_PROCESSORS[0] - run_transaction_authorize - elsif cc_processor == Preference::CC_PROCESSORS[1] - run_transaction_paypal_ipn - else - throw "The currently set preference for cc_processor is not recognized. You might want to add it to the code..." - end - end - # Check to see which cc processor is used - def self.get_cc_processor - Preference.find_by_name('cc_processor').value - end - - # Get the login info for the cc processor (if any) - def self.get_cc_login - Preference.find_by_name('cc_login').value - end - - # Runs an order through Authorize.net - # - # Returns true - # - def run_transaction_authorize - ba = self.billing_address - - # For debugging with a test account... - # ActiveMerchant::Billing::Base.mode = :test - - credit_card = ActiveMerchant::Billing::CreditCard.new( - :number => self.account.cc_number, - :month => self.account.expiration_month, - :year => self.account.expiration_year, - :first_name => ba.first_name, - :last_name => ba.last_name - ) - gateway = ActiveMerchant::Billing::AuthorizeNetGateway.new( - :login => Preference.find_by_name('cc_login').value, - :password => Preference.find_by_name('cc_pass').value, - :ssl_strict => true, - :test => Preference.find_by_name('store_test_transactions').is_true? - ) - address = { - :address1 => ba.address, - :city => ba.city, - :state => ba.state, - :zip => ba.zip, - :country => ba.country.name - } - - # AM requires it's purchaes in CENTS, so adjust accordingly. - response = gateway.purchase(self.total.to_f*100, credit_card, {:address => address}) - # Save transaction id for later - self.auth_transaction_id = response.params[:transaction_id] - - # Handle the response - if response.success? - logger.info("\n\nORDER TRANSACTION ID - #{self.auth_transaction_id}\n\n") - # Set completed - self.cleanup_successful - # Send success message - begin - self.deliver_receipt - rescue => e - logger.error("FAILED TO SEND THE CONFIRM EMAIL") - end - return true - else - # Log errors - logger.error("\n\n[ERROR] FAILED ORDER \n") - logger.error(response.inspect) - logger.error(response.message) - logger.error("\n\n") - # Order failed - store transaction id - self.cleanup_failed(response.message) - # Send failed message - begin - self.deliver_failed - rescue => e - logger.error("FAILED TO SEND THE CONFIRM EMAIL") - end - - return response.message - end - - return false - end - - # Do the cleanup for orders run through Paypal - # - def run_transaction_paypal_ipn - - status_code = self.order_status_code_id - - # Under normal conditions, the paypal ipn should be confirmed already - # but we can't count on that. Assign a status of 4 (awaiting payment) - # if the status is still 1 (cart) - if status_code == 1 - self.order_status_code_id = 4 - self.new_notes = "The order was processed at PayPal but not yet confirmed." - end - - self.save - - self.order_status_code_id - - end - - # Cleans up a successful order - def cleanup_successful - # Decrement inventory for items... - # Also driven by the inventory control preference from the - # admin UI - if Preference.find_by_name('store_use_inventory_control').is_true? - for oli in self.order_line_items do - oli.item.update_attribute('quantity', oli.item.quantity-oli.quantity)if oli.quantity rescue false && oli.item.quantity rescue false - end - end - - self.order_status_code_id = 5 - self.new_notes="Order completed." - if Preference.find_by_name('cc_clear_after_order').is_true? - self.account.clear_personal_information - end - self.save - end - - # Cleans up a failed order - def cleanup_failed(msg) - self.order_status_code_id = 3 - self.new_notes="Order failed!<br/>#{msg}" - self.save - end - - # We define deliver_receipt here because ActionMailer can't seem to render - # components inside a template. - # - # I'm getting around this by passing the text into the mailer. - def deliver_receipt - @content_node = ContentNode.find(:first, :conditions => ["name = ?", 'OrderReceipt']) - OrdersMailer.deliver_receipt(self, @content_node.content) - end - - # If we're going to define deliver_receipt here, why not wrap deliver_failed as well? - def deliver_failed - OrdersMailer.deliver_failed(self) - end - - # Is a discount present? - def is_discounted? - self.order_line_items.collect.each {|item| return true if item.unit_price < 0 } - false - end end \ No newline at end of file app/models/order.rb @@ -10,21 +10,6 @@ class OrderAccount one_to_one :order many_to_one :order_user, :accessor => :protected - @@salt = 'salt_$alt_salt' - #cattr_accessor :salt - @@password = '$ub$truct_change_me' - #cattr_accessor :password - - #attr_protected :order_user_id - - TYPES = { - 'Credit Card' => 1, - 'Checking' => 2, - 'Savings' => 3, - 'Business Checking' => 4, - 'PayPal' => 5 - } - property :cc_number, String property :account_number, String property :expiration_month, Fixnum, :length => 2 @@ -33,119 +18,5 @@ class OrderAccount property :routing_number, String, :length => 20 property :bank_name, String, :length => 50 - # VALIDATION ================================================================ - - #validates_presence_of :order_user_id - - validates_presence_of :cc_number, - :if => Proc.new { |oa| oa.order_account_type_id == TYPES['Credit Card'] }, - :message => ERROR_EMPTY - - validates_presence_of :routing_number, - :if => Proc.new { |oa| oa.order_account_type_id == TYPES['Checking'] || oa.order_account_type_id == TYPES['Business Checking'] }, - :message => ERROR_EMPTY - - validates_presence_of :account_number, - :if => Proc.new { |oa| oa.order_account_type_id == TYPES['Checking'] || oa.order_account_type_id == TYPES['Business Checking'] }, - :message => ERROR_EMPTY - - # TODO: add validates_absence_of here - - validates_format_of :credit_ccv, :with => /^[\d]*$/, :message => ERROR_NUMBER - validates_numericalnes_of :expiration_month, :expiration_year - - # Make sure expiration date is ok. - def validate - today = DateTime.now - begin - if (today.month > self.expiration_month && today.year >= self.expiration_year) - errors.add(:expiration_month, 'Please enter a valid expiration date.') - end - rescue - errors.add(:expiration_month, 'Please enter a valid expiration date.') - end - end - - # CLASS METHODS ============================================================= - - # List of months for dropdown in UI - def self.months - [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - end - - # List of years for dropdown in UI - def self.years - start_year = Date.today.year - years = Array.new - 10.times do - years << start_year - start_year += 1 - end - return years - end - - # INSTANCE METHODS ========================================================== - - # Obfuscates personal information about this account - # - CC number - def clear_personal_information - number = String.new(self.cc_number) - # How many spaces to replace with X's - spaces_to_pad = number.length-4 - # Cut string - new_number = number[spaces_to_pad,number.length] - # Pad with X's - new_number = new_number.rjust(spaces_to_pad, 'X') - self.cc_number = new_number - self.save - # Return number in case we need it - return new_number - end - - # Setter for cc number. - # Crypts before it saves. - # - def cc_number=(number='') - self.set_unencrypted_number(number, 'cc_number') - end - def cc_number - self.get_unencrypted_number('cc_number') - end - - # Setter for account number. - # Crypts before it saves. - # - def account_number=(number='') - self.set_unencrypted_number(number, 'account_number') - end - def account_number - self.get_unencrypted_number('account_number') - end - - # Gets an unencrypted # from the db. - # - def get_unencrypted_number(attribute) - key = EzCrypto::Key.with_password(@@password, @@salt) - # For blanks this can throw a "wrong final block length" error. - begin - value = self[attribute.to_sym] - return key.decrypt64(value) - rescue - nil - end - end - - # Crypts & sets unencrypted number to db. - # This would probably be best as a plugin...but maybe later. - # acts_as_crypted_number ? - def set_unencrypted_number(number='', attribute='') - return if attribute.empty? - key = EzCrypto::Key.with_password(@@password, @@salt) - begin - self[attribute.to_sym] = key.encrypt64(number) - rescue - self[attribute.to_sym] = '' - end - end end \ No newline at end of file app/models/order_account.rb @@ -8,9 +8,7 @@ class OrderAddress one_to_one :order many_to_one :order_user many_to_one :country - - #t.integer "order_user_id", :default => 0, :null => false - + property :first_name, String, :length => 50, :default => "", :nullable => false property :last_name, String, :length => 50, :default => "", :nullable => false property :telephone, String, :length => 20 @@ -31,31 +29,4 @@ class OrderAddress validates_length_of :last_name, :maximum => 50 validates_length_of :address, :maximum => 255 - # TODO: validates_with_method here?? - #validates_exclusion_of :address, :in => ['PO BOX', 'P.O. BOX', 'AFO', 'A.F.O.', 'APO', 'A.P.O.'], - # :message => 'Sorry, we don\'nt ship to P.O. boxes' - - # Makes sure validation address doesn't allow PO Box or variants - def validate - invalid_strings = ['PO BOX', 'P.O. BOX', 'P.O BOX', 'PO. BOX', - 'POBOX', 'P.OBOX', 'P.O.BOX', 'PO.BOX', 'P.BOX', - 'PBOX', 'AFO', 'A.F.O.', 'APO', 'A.P.O.'] - cap_address = self.address.upcase() - invalid_strings.each do |string| - if cap_address.include?(string) then - errors.add(:address, "Sorry, we don't ship to P.O. boxes") - return - end - end - end - - # Finds the shipping address for a given OrderUser - def self.find_shipping_address_for_user(user) - first(:conditions => ["order_user_id = ? AND is_shipping = 1", user.id]) - end - - def name - "#{self.first_name} #{self.last_name}" - end - end \ No newline at end of file app/models/order_address.rb @@ -10,48 +10,4 @@ class OrderLineItem property :unit_price, Float, :default => 0.0, :nullable => false property :name, String, :default => "" - #alias_attribute :price, :unit_price - - # Creates and returns a line item when a product is passed in - def self.for_product(item) - ol_item = self.new - ol_item.quantity = 1 - ol_item.item = item - ol_item.name = item.name - ol_item.unit_price = item.price - return ol_item - end - - def total - self.quantity * self.unit_price - end - - # We still have view code referencing product_id - # Since we changed to variations / products we need - # to use item_id. - # - def product_id - self.item_id - end - - def product - self.item - end - - def code - self.item.code - end - - def name - if !self.item.nil? - return self.item.name - else - return self.attributes['name'] - end - end - - def price - self.unit_price - end - end \ No newline at end of file app/models/order_line_item.rb @@ -21,31 +21,4 @@ class OrderShippingType all(:is_domestic => false, :order => "price ASC") end - # Calculates shipping price for a shipping type with weight. - # If no weight found, use the default. - def calculate_price(weight) - - price = self.price - - if self.weights.size > 0 - proper_weight = self.weights.first( - :conditions => ["? BETWEEN min_weight AND max_weight", weight] - ) - price = proper_weight.price if proper_weight - end - - #self.calculated_price = price + Preference.find_by_name('store_handling_fee').value.to_f - self.calculated_price = price - end - - # Sets weight variations from attribute list. - # - def weights=(list) - self.weights.clear - for variation in list do - v = OrderShippingWeight.create(variation) - self.weights << v - end - end - end \ No newline at end of file app/models/order_shipping_type.rb @@ -1,8 +1,4 @@ -# These are the "variations" of an OrderShippingType -# -# They allow an admin to specify weight ranges and prices -# for an OrderShippingType. -# + class OrderShippingWeight include DataMapper::Resource app/models/order_shipping_weight.rb @@ -7,14 +7,4 @@ class OrderStatusCode property :id, Fixnum, :serial => true property :name, String, :length => 30, :nullable => false - # Defines if we can edit this order or not based on the status code - def is_editable? - case self.id - when 1..5 - return true - else - return false - end - end - end \ No newline at end of file app/models/order_status_code.rb @@ -1,12 +1,5 @@ class Product < StoreItem - # Conditions that the product is in stock, or available - # and just out of stock. - CONDITIONS_AVAILABLE = %Q/ - CURRENT_DATE() >= DATE(items.date_available) - AND items.is_discontinued = 0 - OR (items.is_discontinued = 1 AND (items.quantity > 0 OR items.variation_quantity > 0)) - / - + one_to_many :product_images one_to_many :variations, :dependent => :destroy, :order => 'name ASC' one_to_many :images, @@ -19,160 +12,7 @@ class Product < StoreItem :join_table => 'related_products', :association_foreign_key => 'related_id', :foreign_key => 'product_id' - # :after_add => :add_return_relation, - # :after_remove => :remove_return_relation - - def add_return_relation(relative) - relative.related_products << self unless relative.related_products.include?(self) - end - def remove_return_relation(relative) - sql = "DELETE FROM related_products " - sql << "WHERE product_id = #{relative.id} AND related_id = #{self.id}" - - database.query(sql) - end many_to_many :tags - ############################################################################# - # CALLBACKS - ############################################################################# - - # FIXME Fix callbacks - #after_create :add_cached_related_products - - # Related products (associations) freak out if this - # object isn't saved before adding relatives. - # - # If there's a cached @related_list we try to add em. - # - def add_cached_related_products - self.related_product_ids=@cached_related_list if @cached_related_list - end - - ############################################################################# - # CLASS METHODS - ############################################################################# - - # Admin search for products - # Uses product name, code, or description - def self.search(search_term, count=false, limit_sql=nil) - if (count == true) then - sql = "SELECT COUNT(*) " - else - sql = "SELECT DISTINCT * " - end - sql << "FROM items " - sql << "WHERE (" - sql << " name LIKE ? " - sql << " OR items.description LIKE ? " - sql << " OR items.code LIKE ? " - sql << ") AND items.type = 'Product' " - sql << "ORDER BY date_available DESC " - sql << "LIMIT #{limit_sql}" if limit_sql - arg_arr = [sql, "%#{search_term}%", "%#{search_term}%", "%#{search_term}%"] - if (count == true) then - count_by_sql(arg_arr) - else - find_by_sql(arg_arr) - end - end - - # Finds products by list of tag ids passed in - # - # We could JOIN multiple times, but selecting IN grabs us the products - # and using GROUP BY & COUNT with the number of tag id's given - # is a faster approach according to freenode #mysql - def self.find_by_tags(tag_ids, find_available=false, order_by="items.date_available DESC") - sql = "SELECT * " - sql << "FROM items " - sql << "JOIN products_tags on items.id = products_tags.product_id " - sql << "WHERE products_tags.tag_id IN (#{tag_ids.join(",")}) " - sql << "AND #{CONDITIONS_AVAILABLE}" if find_available==true - sql << "GROUP BY items.id HAVING COUNT(*)=#{tag_ids.length} " - sql << "ORDER BY #{order_by};" - find_by_sql(sql) - end - - ############################################################################# - # INSTANCE METHODS - ############################################################################# - - # Defined to save tags from product edit view - def tags=(list) - tags.clear - for id in list - tags << Tag[id] if !id.empty? - end - end - - # Calculated based on variations - # - def display_price - variations = self.variations.all # :order => "price ASC") - if variations.size == 0 - return self.price - else - low_price = variations[0].price - high_price = variations[variations.size-1].price - if low_price == high_price - return low_price - else - return [low_price, high_price] - end - end - end - - def quantity - if self.variations.count == 0 - return self.attributes['quantity'] - else - return self.variation_quantity - end - end - - # Is the item active on the site? Is it listed in the store? - # - def is_published? - !self.is_discontinued? || self.quantity > 0 - end - - # Is this product new? - # - def is_new? - @cached_is_new ||= - begin - self.date_available >= 2.weeks.ago - end - end - - # Is this product on sale? - # - def is_on_sale? - @cached_on_sale ||= - begin - !self.tags.find_by_name('On Sale').nil? - end - end - - # Adds related products from list. - # Used in UI for auto-completion - # - # See callback for why we return if this is a new record. - # - def related_product_ids=(list) - if self.new_record? - @cached_related_list = list - return - end - - # If self is a new record shit fails - self.related_products.clear - for name in list do - p = Product.find_by_code(name.split(':')[0]) - next if !p || p == self - self.related_products << p - end - end - end \ No newline at end of file app/models/product.rb @@ -1,6 +1,3 @@ -# Represents a connection from an image to a product. -# -# class ProductImage include DataMapper::Resource app/models/product_image.rb @@ -1,9 +1,5 @@ require 'validate' -# Promotions allow discounts to be applied to orders, and -# have the ability to add items to an order as well. -# -# class Promotion include DataMapper::Resource @@ -31,74 +27,7 @@ class Promotion # Validation validates_presence_of :code, :discount_amount, :discount_type, :description - # FIXME: fix validates_uniqueness_of - #validates_uniqueness_of :code validates_numericalnes_of :discount_amount - # FIXME: call backs - #before_save :clean_code - - def clean_code - self.code.gsub!(' ', '') - end - - # Makes sure if 'buy n get one free' discount type that - # a product is selected. - def validate - if self.discount_type == 2 && self.item_id.nil? - errors.add(:item_id, "Please add an item for the 'Buy [n] get 1 free' promotion") - end - end - - # Generates a 15 character alphanumeric code - # that we use to track affiliates and promotions. - # - def self.generate_code(size=15) - # characters used to generate affiliate code - chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" - # create a new record object to satisfy while loop initially - record = Promotion.new - # loop through, creating random affiliate codes until - # we create one that doesn't exist in the db - while record - test_code = "" - srand - size.times do - pos = rand(chars.length) - test_code += chars[pos..pos] - end - # find any affiliates with this same code string - # if none are found the while loop exits - record = first(:code => test_code) - end - # return our random code - return test_code - end - - # Lets us know if any promotions are active. - # - def self.any_active? - !Promotion.find( - :first, - :conditions => "NOW() BETWEEN start AND end" - ).nil? - end - - def is_active? - Time.now.between?(self.start, self.end) - end - - # Setter for product name. Uses suggestion JS and pop-up. - # - # We only really use the first item, which is the ID to look - # up the product. - def product_name=(name) - item = StoreItem.find_by_code(name.split(':')[0]) - if !item - self.item_id = nil - else - self.item_id = item.id - end - end end \ No newline at end of file app/models/promotion.rb @@ -1,12 +1,4 @@ -# A right is a controller resource that determines -# access. -# -# Rights are assigned to roles, roles to users. -# -# Rights consist of a controller name and an action list. -# This action list can be either '*' for access to all actions -# or a CSV list of actions. -# + class Right include DataMapper::Resource app/models/right.rb @@ -1,5 +1,3 @@ -# A role is a collection of rights. -# class Role include DataMapper::Resource @@ -11,14 +9,4 @@ class Role property :name, String property :description, DataMapper::Types::Text - # Sets rights by list of id's passed in - def right_ids=(id_list) - self.rights.clear - for id in id_list - next if id.empty? - right = Right[id] - self.rights << right if right - end - end - end \ No newline at end of file app/models/role.rb @@ -1,5 +1,3 @@ -# This is the base model for Product and ProductVariation. -# require "date" require "validate" @@ -25,36 +23,7 @@ class StoreItem property :is_discontinued, TrueClass, :default => false, :nullable => false property :type, Class # enable single-table inheritence - - #t.integer "product_id", :default => 0, :null => false - - # FIXME - #add_index ["quantity", "is_discontinued", "variation_quantity"], :name => "published" - #add_index ["product_id", "type"], :name => "variation" - #add_index ["date_available", "is_discontinued", "quantity", "variation_quantity", "type"], :name => "tag_view" - #add_index ["name", "code", "is_discontinued", "date_available", "quantity", "variation_quantity", "type"], :name => "search" validates_presence_of :name, :code - # FIXME: fix validates_uniqueness_of - #validates_uniqueness_of :code - - ############################################################################# - # CALLBACKS - ############################################################################# - - - ############################################################################# - # CLASS METHODS - ############################################################################# - - def find_by_code(code) - first(:code => code) - end - - # Name output for product suggestion JS - # - def suggestion_name - "#{self.code}: #{self.name}" - end end \ No newline at end of file app/models/store_item.rb @@ -1,11 +1,5 @@ require 'validate' -# Tags are how we organize products inside Substruct. -# -# Tags may be ordered, and contain other tags. In this fashion, -# they can act like old-school "categories", or new-school tagging -# systems. -# class Tag include DataMapper::Resource @@ -22,53 +16,13 @@ class Tag validates_presence_of :name #validates_uniqueness_of :name - # FIXME : fix the tree - #is_a_tree - #acts_as_tree :order => '-rank DESC' - - # Most used finder function for tags. - # Selects by alpha sort. def self.find_alpha all(:order => [ DataMapper::Query::Direction.new("name", :asc) ]) end - # Finds ordered parent tags. - # def self.find_ordered_parents all(:conditions => [:parent_id => nil, :parent_id => 0], :order => [ DataMapper::Query::Direction.new(:rank, :desc) ]) end - # Finds a list of related tags for the tag id's passed in - # - # Uses the tag ids passed in - # - Finds products with the tags applied (inside the subselect) - # - Find and returns tags also tagged to the products, but not passed in - def self.find_related_tags(tag_id_list) - tag_id_list_string = tag_id_list.join(",") - sql = "SELECT items.id " - sql << "FROM items " - sql << "JOIN products_tags on items.id = products_tags.product_id " - sql << "WHERE products_tags.tag_id IN (#{tag_id_list_string}) " - sql << "GROUP BY items.id HAVING COUNT(*)=#{tag_id_list.length};" - items = StoreItem.find_by_sql(sql) - - item_ids = items.collect { |i| i.id } - item_id_str = item_ids.join(',') - - if item_ids.size > 0 - sql = "SELECT DISTINCT t.* FROM products_tags pt, tags t WHERE pt.product_id IN(#{item_id_str})" - sql << "AND t.id = pt.tag_id " - sql << "AND t.id NOT IN (#{tag_id_list_string});" - return find_by_sql(sql) - else - return [] - end - end - - # Returns the number of products tagged with this item - def product_count - @cached_product_count ||= self.products.count - end - end \ No newline at end of file app/models/tag.rb @@ -1,9 +1,3 @@ -# Represents a file uploaded by a user. -# -# Subclassed by Image and Asset -# -# Before a save, checks to set the type, based on file extension. -# class UserUpload include DataMapper::Resource @@ -20,53 +14,5 @@ class UserUpload property :thumbnail, String property :size, Fixnum property :type, Class - - # Checks what type of file this is based on extension. - # - # If it's an image, we treat it differently and save - # as an image type. - # - # No, we're not using anything fancy here, just the extension set. - # - - # FIXME - #before_save :downcase_extension - - def downcase_extension - self.filename = "#{self.filename[0, self.filename.rindex('.')]}.#{self.extension.downcase}" - end - - # Returns extension - # - def extension - self.filename[self.filename.rindex('.') + 1, self.filename.size] - end - - # Returns file name - # - def name - self.filename - end - - def relative_path - #self.filename[self.filename.rindex('/public/system')+7, self.filename.size] - self.filename - end - - def filename_without_ext - self.filename[0, self.filename.rindex('.')] - end - # use this to make a new user upload when you don't know whether it should - # be an image or an asset. Can't use UserUpload.new since it doesn't have uploaded_data. - def self.init(file_data) - if file_data.content_type.index('image') - upload = Image.new - else - upload = Asset.new - end - upload.uploaded_data = file_data - upload - end - end app/models/user_upload.rb @@ -1,54 +1,5 @@ -# Holds information about how the product varies. -# class Variation < StoreItem many_to_one :product - - # FIXME: work out why this isn't working! - #property :variation_quantity, Fixnum, :default => 0, :nullable => false - - ############################################################################# - # CALLBACKS - ############################################################################# - - # FIXME: fix callbacks - #before_save :set_date_available - #after_save :update_parent_quantity - - # DB complains if there's not a date available set. - # This is a cheap fix. - def set_date_available - self.date_available = Date.today if !self.date_available - end - - def update_parent_quantity - self.product.update_attribute('variation_quantity', self.product.variations.sum('quantity')) - end - - ############################################################################# - # CLASS METHODS - ############################################################################# - - # References parent product images collection. - # - def images - self.product.images - end - - # Display name...includes product name as well - def name - if self.product - return "#{self.product.name} - #{self.attributes['name']}" - else - return self.attributes['name'] - end - end - def short_name - self.attributes['name'] - end - # Override setter? - # def name=(str) - # self.attributes['name'] = str - # end end \ No newline at end of file app/models/variation.rb @@ -1,5 +1,3 @@ -# Items that make up a customer's wishlist. -# class WishlistItem include DataMapper::Resource @@ -9,5 +7,5 @@ class WishlistItem property :id, Fixnum, :serial => true property :created_on, DateTime - + end \ No newline at end of file app/models/wishlist_item.rb @@ -1,91 +0,0 @@ -<div id="left"> - <h1><%= @title %></h1> - <% if @aname != 'list' && @aname != 'index' %> - <ul class="navigation secondary"> - <li><a href="/admin/content_nodes/list_sections/">Back to Content Section List</a></li> - </ul> - <% else %> - <ul class="navigation secondary"> - <li> - <% if !params[:sort].nil? && params[:sort] == 'name' %> - <%= - link_to( - 'Sort Newest to Oldest', - :action => 'index', - :key => params[:key], - :sort => 'date' - ) - %> - <% else %> - Sorted Newest to Oldest - <% end %> - </li> - <li> - <% if params[:sort] != 'name' %> - <%= - link_to( - 'Sort A-Z', - :action => 'index', - :key => params[:key], - :sort => 'name' - ) - %> - <% else %> - Sorted A-Z - <% end %> - </li> - </ul> - <% end %> - - <%= will_paginate @content_nodes %> - <br/> - - <table class="list" cellspacing="0" cellpadding="0"> - <colgroup> - <col style="width:150px;"/> - <col /> - <col style="width:120px;"/> - <col /> - <col /> - </colgroup> - <tr> - <th>URL</th> - <th>Title</th> - <th>Content Length</th> - <th>Display Date</th> - <th>Type</th> - </tr> - - <% if @content_nodes.length > 0 then %> - <% for content_node in @content_nodes %> - <tr class="<%= alternate %>"> - <td> - <%= link_to truncate(content_node.name, 20), {:action => 'edit', :id => content_node} %> - <br/> - <br/> - <span class="info"><%= link_to 'Show here', {:action => 'show', :id => content_node}, :class=> 'normal' %></span> - <br/> - <span class="info"><a href="/<%= content_node.name %>" class="normal">Show on the site</a></span> - </td> - <td> - <%= content_node.title %> - </td> - <td><%= number_with_delimiter(content_node.content.length, ',') %> characters</td> - <td><%= content_node.display_on.strftime("%m/%d/%y") %></td> - <td><%= content_node.class.to_s %></td> - </tr> - <% end %> - <% else %> - <tr> - <td colspan="5">No content to display in this view</td> - </tr> - <% end %> - </table> - -  - <br/> - <%= will_paginate @content_nodes %> -</div> - - -<%= render(:partial => 'content_right_side') %> app/views/admin/content_nodes/index.html.erb @@ -1,154 +0,0 @@ -<% #content_for :header do %> - <style type="text/css"> - .user_upload { - width: 90px; - overflow: hidden; - float: left; - text-align: center; - margin-right: 5px; - margin-bottom: 10px; - border: 1px solid #ccc; - padding: 5px; - } - .user_upload .image { - height: 60px; - } - .user_upload .delete_icon { - position: absolute; - z-index: 20; - margin-left: -10px; - margin-top: -10px; - } - #upload_container { - margin-bottom:25px; - } - </style> - - <script language="javascript"> - function status(file_id) { - $('trash_'+file_id).hide(); - $('spin_'+file_id).show(); - } - function deleteFile(file_id) { - new Effect.Fade($('file_'+file_id)); - } - function showUploadArea() { - new Effect.Appear($('upload_container')); - $('show_upload_button').hide(); - $('hide_upload_button').show(); - } - function hideUploadArea() { - new Effect.Fade($('upload_container')); - $('hide_upload_button').hide(); - $('show_upload_button').show(); - } - </script> -<% #end %> - -<div id="left"> - <div id="upload_container" style="display:none;"> - <h1>Upload New Files</h1> - <%= form_tag({:action => 'upload'}, :multipart => true) %> - <%= - render :partial => '/shared/multiple_upload', - :locals => { - :name => 'file', - :input_size => '30' - } - %> - <%= submit_tag 'Upload Files', :class => 'button' %> - </form> - </div> - - <h1 style="margin-top:0px;"><%=h @title %></h1> - - <ul class="navigation secondary"> - <li> - <% if !params[:sort].nil? && params[:sort] == 'name' %> - <%= - link_to( - 'Sort Newest to Oldest', - :action => 'index', - :key => params[:key], - :sort => 'date' - ) - %> - <% else %> - Sorted Newest to Oldest - <% end %> - </li> - <li> - <% if params[:sort] != 'name' %> - <%= - link_to( - 'Sort A-Z', - :action => 'index', - :key => params[:key], - :sort => 'name' - ) - %> - <% else %> - Sorted A-Z - <% end %> - </li> - </ul> - - <%= will_paginate @files %> - <br/> - - <% if @files.size == 0 %> - <div class="content_pad"> - <p> - No files to show. - </p> - </div> - <% end %> - - <% for @file in @files do %> - <%= render :partial => 'file' %> - <% end %> - <div class="clear"> </div> - - <br/> - <%= will_paginate @files %> -</div> - - -<div id="right"> - <br/> - <a href="#" onclick="showUploadArea();" class="button" id="show_upload_button">Upload New Files</a> - <a href="#" onclick="hideUploadArea();" class="button cancel" style="display:none;" id="hide_upload_button">Cancel Uploading Files</a> - <div class="clear"> </div> - - <h1>View Files by Type</h1> - <ul> - <li> - <%= - link_to_unless_current( - 'All Files', - :action => 'index' - ) - %> - </li> - <li> - <%= - link_to_unless_current( - 'Images', - :action => 'index', - :key => 'Image' - ) - %> - </li> - <li> - <%= - link_to_unless_current( - 'Others', - :action => 'index', - :key => 'Asset' - ) - %> - </li> - </ul> -</div> - -<div class="clear"> </div> \ No newline at end of file app/views/admin/files/index.html.erb @@ -1,101 +0,0 @@ -<div id="left"> - <h1><%=h @title %></h1> - - <%= generate_navigation(@list_options, @viewing_by, 'list') %> - - <% if @search_title %> - <h2><%=h @search_title %></h2> - <% end %> - - <% if @orders.length == 0 then %> - <h4>No orders have been taken that apply to this view.</h4> - <div class="padLeft"> - <p>Would you like to try another view?</p> - <ul> - <li> - <a href="/admin/orders/list?key=Ready+To+Ship">Ready To Ship</a> - <br/> - <span class="info">Orders that have been paid for and are ready to be shipped out.</span> - </li> - <li> - <a href="/admin/orders/list?key=On+Hold">On Hold</a> - <br/> - <span class="info">Orders awaiting payment, or orders that have failed to process correctly. - <br/>(Due to invalid data entry of credit card, address, etc)</span> - </li> - <li> - <a href="/admin/orders/list?key=Completed">Completed</a> - <br/> - <span class="info">Orders have been shipped and completed</span> - </li> - <li> - <a href="/admin/orders/list?key=All">All</a> - <br/> - <span class="info">All orders, regardless of status</span> - </li> - </ul> - </div> - -  - - <% else %> - - <table class="list" cellpadding="0" cellspacing="0"> - <colgroup> - <col/> - <col style="width:70px;"/> - <col style="width:190px;"/> - <col style="width:70px;"/> - </colgroup> - <tr> - <th>Order Name / Number</th> - <th>Date</th> - <th>Status</th> - <th>Total</th> - </tr> - <% for order in @orders %> - <tr class="<%= alternate %>"> - <td> - <%= link_to(h(order.name), :action => 'show', :id => order) if order.order_account %> - <br/> - <%= link_to(order.order_number, :action => 'show', :id => order) %> - </td> - <td><%= order.created_on.strftime("%m/%d/%y %I:%M %p") %></td> - <td><%= order.status %></td> - <td class="numeric"><%= number_to_currency(order.total) %></td> - </tr> - <% end %> - </table> - -  - <p style="margin-top:10px;"> - <%= link_to "Download Orders: XML", - { :action => 'download', - :ids => @orders.collect{|o| o.id}, - :format => 'xml' }, - :class => 'action' - %> - <%= link_to "Download Orders: CSV", - { :action => 'download', - :ids => @orders.collect{|o| o.id}, - :format => 'csv' }, - :class => 'action' - %> - </p> - -  - <%= will_paginate @orders %> - - <%# render(:partial => '/shared/pagination', - :object => @order_pages, - :locals => {:params => {:key =>@viewing_by, :term => @search_term} }) %> - - <% end %> -</div> - - -<%= render(:partial => 'right_side') %> - app/views/admin/orders/index.html.erb @@ -1,155 +0,0 @@ -<div id="left"> - <h1><%= @title %></h1> - <div class="padLeft"> - <%= form_tag :action => 'save_prefs' %> - - - <div class="floatHalf"> -  - <h2>Store Configuration</h2> - <div class="padLeft"> - <p> - <%= make_label('Store Name', true) %> - <%= text_field_tag('prefs[store_name]', @prefs['store_name'].value, :class => 'textInput')%> - </p> - <p> - <%= make_label('Handling Fee', true) %> - <%= text_field_tag('prefs[store_handling_fee]', @prefs['store_handling_fee'].value, :class => 'textInput')%> - <br/> - <span class="info">This charge will be added to all orders.</span> - </p> - <p> - <%= make_label('Your Country', true) %> - <%= - render_component( - :controller => "countries", - :action => "select_list", - :params => { - :select_name => 'prefs[store_home_country]', - :selected => @prefs['store_home_country'].value - } - ) - %> - </p> - <p> - <label> - <%= check_box_tag('prefs[store_show_confirmation]', 1, (@prefs['store_show_confirmation'].is_true?)) %> - Show order confirmation page? - </label> - <input name="prefs[store_show_confirmation]" type="hidden" value="0" /> - </p> - <p> - <label> - <%= check_box_tag('prefs[store_use_inventory_control]', 1, (@prefs['store_use_inventory_control'].is_true?)) %> - Use inventory control? - </label> - <input name="prefs[store_use_inventory_control]" type="hidden" value="0" /> - <span class="info">If set, items that are out of stock can't be added to your customer's cart.</span> - </p> - <p> - <label> - <%= check_box_tag('prefs[store_require_login]', 1, (@prefs['store_require_login'].is_true?)) %> - Require login for returning customers? - </label> - <input name="prefs[store_require_login]" type="hidden" value="0" /> - <span class="info"> - If set, customers who have ordered previously will be prompted for their e-mail and password or previous order number upon checkout. - <br/> - After login, their adress information will be auto-filled in the checkout form. - </span> - </p> - </div> - </div> - - <div class="floatHalf"> - <h2>Credit Card Processing</h2> - - <div class="padLeft"> - <p> - <label> - <%= check_box_tag('prefs[store_test_transactions]', 1, (@prefs['store_test_transactions'].is_true?)) %> - Store is in test mode - </label> - <span class="info">When in test mode, no real orders will be processed.</span> - <input name="prefs[store_test_transactions]" type="hidden" value="0" /> - </p> - <p> - <%= make_label('Processor', true) %> - <%= select_tag('prefs[cc_processor]', options_for_select(Preference::CC_PROCESSORS, @prefs['cc_processor'].value)) %> - </p> - <p> - <%= make_label('Login', true) %> - <%= text_field_tag('prefs[cc_login]', @prefs['cc_login'].value, :class => 'textInput')%> - <br> - <span class="info">When using PayPal, this is your PayPal email address</span> - </p> - <p> - <%= make_label('Password') %> - <%= password_field_tag('prefs[cc_pass]', @prefs['cc_pass'].value, :class => 'textInput')%> - </p> - <p> - <label> - <%= check_box_tag('prefs[cc_clear_after_order]', 1, (@prefs['cc_clear_after_order'].is_true?)) %> - Clear all but last 4 digits of CC# after processing order? - <br/> - <span class="info">If set, after a successful order all but the last 4 digits of CC# will be cleared.</span> - </label> - <input name="prefs[cc_clear_after_order]" type="hidden" value="0" /> - </p> - </div> - </div> - - <div class="line clear"></div> - - <h2>Mail Server</h2> - <div class="padLeft"> - <div class="floatHalf"> - <p> - <%= make_label('SMTP Authentication Type', true) %> - <%= select_tag('prefs[mail_auth_type]', options_for_select(Preference::MAIL_AUTH, @prefs['mail_auth_type'].value)) %> - </p> - <p> - <%= make_label('SMTP Mail Host', true) %> - <%= text_field_tag('prefs[mail_host]', @prefs['mail_host'].value, :class => 'textInput')%> - </p> - <p> - <%= make_label('SMTP Port', true) %> - <%= text_field_tag('prefs[mail_port]', @prefs['mail_port'].value, :class => 'textInput')%> - </p> - </div> - <div class="floatHalf"> - <p> - <%= make_label('SMTP Username / Send E-mails as', true) %> - <%= text_field_tag('prefs[mail_username]', @prefs['mail_username'].value, :class => 'textInput')%> - </p> - <p> - <%= make_label('SMTP Password') %> - <%= password_field_tag('prefs[mail_password]', @prefs['mail_password'].value, :class => 'textInput')%> - </p> - <p> - <%= make_label('Copy all mails to', true) %> - <%= text_field_tag('prefs[mail_copy_to]', @prefs['mail_copy_to'].value, :class => 'textInput', :size => 40, :maxlength => 256)%> - <br/> - <span class="info"> - Sends a copy of all outgoing mails to this address. - <br/> - For multiple addresses, separate with commas. - </span> - </p> - </div> - </div> - - <div class="line clear"></div> - - <%= submit_tag 'Save Preferences', :class => 'button', :disable_with => 'Saving...' %> - - </form> - - </div> -</div> - -<div id="right"> - <%= render :partial => 'sidebar' %> -</div> - -<div class="clear"></div> \ No newline at end of file app/views/admin/preferences/index.html.erb @@ -1,57 +0,0 @@ -<div id="left"> - <h1><%= @title %></h1> - - <% if @search_term || @list_options %> -  - <p> - <a href="/admin/products/list/">Show all Products...</a> - </p> - <% end %> - - <%= will_paginate @products %> - <br/> - - <table class="list" cellpadding="0" cellspacing="0"> - <colgroup> - <col /> - <col style="width:150px;" /> - <col style="width:110px;" /> - <col style="width:60px;" /> - <col style="width:60px;" /> - </colgroup> - <tr> - <th>Name</th> - <th>Code</th> - <th class="numeric">Price</th> - <th class="numeric">Quantity</th> - <th>Published?</th> - </tr> - <% if @products.length > 0 then %> - <% for product in @products %> - <tr class="<%= alternate %>"> - <td><%= link_to(h(product.name), :action => 'edit', :id => product) %></td> - <td><%= product.code %></td> - <td class="numeric"><%= number_to_currency(product.price) %></td> - <td class="numeric"><%= product.quantity %></td> - <td style="text-align:center"> - <%= - image_tag( - product.is_published? ? 'icons/png-24/16-square-green.png' : 'icons/png-24/16-square-red.png', - :style => 'margin: 5px;', - :plugin => 'substruct' - ) - %> - </td> - </tr> - <% end %> - <% else %> - <tr><td colspan="4">No products to show in this view.</td></tr> - <% end %> - </table> - - <br/> - <%= will_paginate @products %> - -</div> - -<%= render(:partial => 'right_side') %> app/views/admin/products/index.html.erb @@ -1,71 +0,0 @@ -<div id="left"> - <%= render :partial => 'subnav' %> - - <% if @promotions.length == 0 then %> - <h4>No promotions have been created.</h4> - <% else %> - - <table class="list" cellpadding="0" cellspacing="0"> - <colgroup> - <col/> - <col style="width:150px;" /> - <col/> - <col style="width:100px;" /> - <col style="width:100px;" /> - </colgroup> - <tr> - <th>Code</th> - <th>Active?</th> - <th>Description</th> - <th class="numeric">Discount</th> - <th class="numeric">Orders</th> - </tr> - <% for promo in @promotions %> - <tr class="<%= alternate %>"> - <td><%= link_to(promo.code, :action => 'edit', :id => promo) %></td> - <td style="text-align:center;"> - <%= - image_tag( - promo.is_active? ? 'icons/png-24/16-square-green.png' : 'icons/png-24/16-square-red.png', - :align => 'left', - :style => 'margin: 5px;', - :plugin => 'substruct' - ) - %> - <p class="info"> - <%= promo.start.strftime("%m/%d/%y @ %I:%M %p") %> - <br/> - to - <br/> - <%= promo.end.strftime("%m/%d/%y @ %I:%M %p") %> - </p> - </td> - <td> - <%= promo.description %> - <br/> - <% if promo.item %> - <span class="info"> - Add item: <%= promo.item.name %> - <%= number_to_currency(promo.item.price) %> - </span> - <% end %> - </td> - <td class="numeric"> - <% if promo.discount_type == 0 %> - <%= number_to_currency(promo.discount_amount) %> - <% elsif promo.discount_type == 1 %> - <%= promo.discount_amount %>% - <% elsif promo.discount_type == 2 %> - Buy <%= promo.discount_amount.to_i %>, get 1 free - <% end %> - </td> - <td class="numeric"><%= link_to(number_with_delimiter(promo.orders.size, ','), :action => 'show_orders', :id => promo) %></td> - </tr> - <% end %> - </table> - - <% end %> -</div> - - -<%= render(:partial => 'right_side') %> - app/views/admin/promotions/index.html.erb @@ -1,43 +0,0 @@ -<div id="left"> - <h1><%= @title %></h1> - - <table class="list" cellpadding="0" cellspacing="0"> - <colgroup> - <col/> - <col style="width:70px;" /> - <col style="width:70px;" /> - <col style="width:60px;" /> - </colgroup> - <tr> - <th>Question</th> - <th>Created</th> - <th>FAQ Rank</th> - <th>Viewed</th> - </tr> - - <% if @questions.length > 0 then %> - <% for question in @questions %> - <tr class="<%= alternate %>"> - <td><%= link_to(h(question.short_question), :action => 'edit', :id => question) %></td> - <td><%= question.created_on.strftime("%m/%d/%y %I:%M %p") %></td> - <td class="numeric"><%=h question.rank %></td> - <td class="numeric"><%=h question.times_viewed %></td> -  - </tr> - <% end %> - <% else %> - <tr> - <td colspan="4">No questions have been asked yet.</td> - </tr> - <% end %>f - </table> - -  - <%= will_paginate @questions %> -</div> - -<%= render(:partial => 'right_side') %> app/views/admin/questions/index.html.erb @@ -1,175 +0,0 @@ -<% content_for :header do %> - <script language="javascript" type="text/javascript"> - /** - * There's a lot of JS in this page I should probably move - * to an external file, but for now I'm just leaving it here. - * - * All of it is specific to the AJAX stuff on this page. - */ - - // Deletes a row after AJAX completion & recolors table - var returnVal = null; - - // Checks to see if there are no sections, shows the "no sections" row if necessary - function noSectionsCheck() { - var list = $("section_list"); - // Possibly no sections - show no sections row - if (list.children.length == 2) { - Element.show("no_sections_row"); - } else { - Element.hide("no_sections_row") - } - } - - function deleteRow(row_id) { - Element.remove($(row_id)); - noSectionsCheck(); - } - - // Shows spinning status wait thing - function status(section_id) { - Element.hide("trash_"+section_id); - Element.show("spin_"+section_id); - } - - // Shows spinning loading status for creating a section - function loadingCreateSection() { - // Show progress - $("save_button").disabled = true; - } - - // On success of a section creation makes a new row in our table - function insertSection(request) { - var content = request.responseText; - - if (content == "") { - // Create failed! - alert("Creation of this Section failed.\nDid you enter a duplicate name?"); - } else { - // Create worked, make new table row and fill it in - new Insertion.Bottom($("section_list"), content); - Sortable.create("section_list", {onUpdate:function(){new Ajax.Request('/admin/sections/update_rank', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("section_list")})}}); - } - // Reload form - $("section_name").value = ""; - $("save_button").disabled = false; - noSectionsCheck(); - } - - // Starts editing of section - function showEditSection(section_id) { - Element.hide("section_name_"+section_id); - Element.hide("section_rename_"+section_id); - Element.show("section_rename_controls_"+section_id); - Element.show("section_edit_"+section_id); - // focus on edit - //$("section_input_"+section_id).value = $("section_name_"+section_id).innerHTML; - $("section_input_"+section_id).focus(); - } - - // Saves edit to a section name - function saveEdit(section_id) { - Element.hide("section_rename_controls_"+section_id); - Element.show("spin_edit_"+section_id); - // Make AJAX request to rename section - new Ajax.Request('/admin/sections/update', - { parameters:'id='+section_id+'&name='+$F("section_input_"+section_id), - evalScripts:true, - onFailure:editFailure } - ); - } - - // Runs when AJAX edit failure - function editFailure(t) { - alert("There was a communication error with the server when trying to save your section.") - } - - </script> - <style type="text/css"> - /* make sure both hide/show divs have the same height so no UI jump */ - #create_section, #create_loading { - height: 35px; - } - </style> -<% end %> - -<div id="left"> - - <h1><%= @title %></h1> - - <ul class="navigation secondary"> - <li><a href="/admin/content_nodes/list">Back to Content Nodes</a></li> - </ul> - -  - <div id="create_section" align="center"> - <%= - form_remote_tag( - :complete => "", - :url => { - :controller => "sections", - :action => "create", - :id => @parent_section_id - }, - :loading => "loadingCreateSection();", - :complete => "insertSection(request);", - :position => "section_list" - ) - %> - <table> - <tr> - <td> - <%= text_field 'section', 'name', :class => 'textInput big' %> - </td> - <td> - <%= submit_tag "Save New Section", :id => "save_button", :class => 'button' %> - </td> - </tr> - </table> - </form> - </div> -  - - <h2> - <% if !@parent_section %> - Top Level Sections - <% else %> - <a href="/admin/sections/list">Top Level Sections</a> > <%= @parent_section.name %> - <% end %> - </h2> - -  - <ul id="section_list" class="sortable"> - <%= render(:partial => 'section_list_row', :collection => @sections) %> - </ul> - <div id="no_sections_row" style="display:<%= @sections.size > 0 ? 'none' : '' %>;">No sections to show...</div> - <%= - sortable_element( - 'section_list', - :url => { :action => 'update_rank' } - ) - %> - -</div> -<div id="right"> - <%= render :partial => '/admin/preferences/sidebar' %> - - <h1>Help</h1> - <h3>Section Groups</h3> - <p><span class="hlt"> - You may group sections one level deep. - </span></p> - <p> - To use a section as a group click on it's name. You will be taken to another view where you may create and order sections within the group. - </p> - <p> - Deleting a section group will delete all sections within as well. - </p> - <h3>Sorting</h3> - <p> - You can sort the items shown by dragging and dropping them. - </p> - -</div> - -<div class="clear"></div> \ No newline at end of file app/views/admin/sections/index.html.erb @@ -1,179 +0,0 @@ -<% content_for :header do %> - <script language="javascript" type="text/javascript"> - /** - * There's a lot of JS in this page I should probably move - * to an external file, but for now I'm just leaving it here. - * - * All of it is specific to the AJAX stuff on this page. - */ - - // Deletes a row after AJAX completion & recolors table - var returnVal = null; - - // Checks to see if there are no tags, shows the "no tags" row if necessary - function noTagsCheck() { - var list = $("tag_list"); - // Possibly no tags - show no tags row - if (list.children.length == 2) { - Element.show("no_tags_row"); - } else { - Element.hide("no_tags_row") - } - } - - function deleteRow(row_id) { - Element.remove($(row_id)); - noTagsCheck(); - } - - // Shows spinning status wait thing - function status(tag_id) { - Element.hide("trash_"+tag_id); - Element.show("spin_"+tag_id); - } - - // Shows spinning loading status for creating a tag - function loadingCreateTag() { - // Show progress - $("save_button").disabled = true; - } - - // On success of a tag creation makes a new row in our table - function insertTag(request) { - var content = request.responseText; - - if (content == "") { - // Create failed! - alert("Creation of this Tag failed.\nDid you enter a duplicate name?"); - } else { - // Create worked, make new table row and fill it in - new Insertion.Bottom($("tag_list"), content); - Sortable.create("tag_list", {onUpdate:function(){new Ajax.Request('/admin/tags/update_tag_rank', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("tag_list")})}}); - } - // Reload form - $("tag_name").value = ""; - $("save_button").disabled = false; - noTagsCheck(); - } - - // Starts editing of tag - function showEditTag(tag_id) { - Element.hide("tag_name_"+tag_id); - Element.hide("tag_rename_"+tag_id); - Element.show("tag_rename_controls_"+tag_id); - Element.show("tag_edit_"+tag_id); - // focus on edit - //$("tag_input_"+tag_id).value = $("tag_name_"+tag_id).innerHTML; - $("tag_input_"+tag_id).focus(); - } - - // Saves edit to a tag name - function saveEdit(tag_id) { - Element.hide("tag_rename_controls_"+tag_id); - Element.show("spin_edit_"+tag_id); - // Make AJAX request to rename tag - new Ajax.Request('/admin/tags/update', - { parameters:'id='+tag_id+'&name='+$F("tag_input_"+tag_id), - evalScripts:true, - onFailure:editFailure } - ); - } - - // Runs when AJAX edit failure - function editFailure(t) { - alert("There was a communication error with the server when trying to save your tag.") - } - - </script> - <style type="text/css"> - /* make sure both hide/show divs have the same height so no UI jump */ - #create_tag, #create_loading { - height: 35px; - } - </style> -<% end %> - -<div id="left"> - - <h1><%= @title %></h1> - - <ul class="navigation secondary"> - <li><a href="/admin/products/list">Back to Products</a></li> - </ul> - -  - <div id="create_tag" align="center"> - <%= - form_remote_tag( - :complete => "", - :url => { - :controller => "tags", - :action => "create", - :id => @parent_tag_id - }, - :loading => "loadingCreateTag();", - :complete => "insertTag(request);", - :position => "tag_list" - ) - %> - <table> - <tr> - <td> - <%= text_field 'tag', 'name', :class => 'textInput big' %> - </td> - <td> - <%= submit_tag "Save New Tag", :id => "save_button", :class => 'button' %> - </td> - </tr> - </table> - </form> - </div> -  - - <h2> - <% if !@parent_tag %> - Top Level Tags - <% else %> - <a href="/admin/tags/list">Top Level Tags</a> > - <% if @parent_tag.parent %> - <%= link_to(@parent_tag.parent.name, :action => 'list', :id => @parent_tag.parent.name ) %> > - <% end %> - <%= @parent_tag.name %> - <% end %> - </h2> - -  - <ul id="tag_list" class="sortable"> - <%= render(:partial => 'tag_list_row', :collection => @tags) %> - </ul> - <div id="no_tags_row" style="display:<%= @tags.size > 0 ? 'none' : '' %>;">No tags to show...</div> - <%= - sortable_element( - 'tag_list', - :url => { :action => 'update_tag_rank' } - ) - %> - -</div> -<div id="right"> - <%= render :partial => '/admin/preferences/sidebar' %> - - <h1>Help</h1> - <h3>Tag Groups</h3> - <p><span class="hlt"> - You may group tags two levels deep. - </span></p> - <p> - To use a tag as a group click on it's name. You will be taken to another view where you may create and order tags within the group. - </p> - <p> - Deleting a tag group will delete all tags within as well. - </p> - <h3>Sorting</h3> - <p> - You can sort the items shown by dragging and dropping them. - </p> - -</div> - -<div class="clear"></div> \ No newline at end of file app/views/admin/tags/index.html.erb @@ -1,32 +0,0 @@ -<div id="left"> - <h1>Blog</h1> - - <% for node in @content_nodes %> - <h2 class="cap"><a href="/blog/<%= node.name %>/"><%= node.title %></a></h2> - <div class="padLeft"> -  - <%= node.content %> - <div class="line"> </div> - <p class="info"> - <a href="/blog/<%= node.name %>/">Read more...</a> | - Published:  - - </p> - </div> - <% end %> - - <% if @content_nodes.length == 0 then %> - <p> - No content has been created yet. Please login to the <a href="/admin">admin section</a> and create some. - </p> - <% end %> - -  - -</div> - -<div id="right"> -  -</div> - -<div class="clear"></div> \ No newline at end of file app/views/content_nodes/index.html.erb @@ -13,15 +13,7 @@ <div id="container"> <div id="header"> -  - <ul class="navigation" id="toplinks"> - <li style="margin-right:0px;"> - <a href="/store/show_cart" class="submodal-600-400">Cart</a> - </li> - <li><a href="/customers/wishlist">Wishlist</a></li> - <li><a href="/questions/ask">Contact Us</a></li> - <li><a href="/customers/orders">Track an Order</a></li> - </ul> + </div> @@ -32,11 +24,7 @@ <div id="footer"> <ul class="navigation"> - <li><a href="/">Home</a></li> - <li><a href="/contact">Contact Us</a></li> - <li><a href="/blog">Blog</a></li> - <li><a href="/customers/wishlist">Wishlist</a></li> - <li><a href="/store/show_cart" class="submodal-600-400">Cart</a></li> + </ul> </div> app/views/layout/application.html.erb @@ -13,8 +13,6 @@ Merb::Config.use do |c| end ### Globals -ERROR_EMPTY = 'Please fill in this field.' -ERROR_NUMBER = 'Please enter only numbers (0-9) in this field.' MEGABYTE = 1024.0 * 1024.0 MAX_SIZE = 10 * MEGABYTE config/init.rb @@ -22,7 +22,7 @@ Merb::Router.prepare do |r| r.match("/users/activate/:activation_code").to(:controller => "Users", :action => "activate").name(:user_activation) - r.match('/').to(:controller => 'ContentNodes', :action =>'show_by_name', :name => 'home') + #r.match('/').to(:controller => 'ContentNodes', :action =>'show_by_name', :name => 'home') #r.match('').to(:controller => 'ContentNodes', :action => 'show_by_name', :name => 'home') # Default administration mapping @@ -30,17 +30,15 @@ Merb::Router.prepare do |r| # :controller => 'admin/orders', # :action => 'index' - r.match('/blog').to(:controller => 'ContentNodes', :action => 'index') - r.match('/blog/section/:section_name').to(:controller => 'ContentNodes', :action => 'list_by_section') - r.match('/blog/:name').to(:controller => 'ContentNodes', :action => 'show_by_name') + #r.match('/blog').to(:controller => 'ContentNodes', :action => 'index') + #r.match('/blog/section/:section_name').to(:controller => 'ContentNodes', :action => 'list_by_section') + #r.match('/blog/:name').to(:controller => 'ContentNodes', :action => 'show_by_name') - r.match('/contact').to(:controller => 'Questions', :action => 'new') - # map.connect '/store/show_by_tags/*tags', # :controller => 'store', # :action => 'show_by_tags' # For things like /about_us, etc - r.match('/:name').to(:controller => 'ContentNodes', :action => 'show_by_name') + #r.match('/:name').to(:controller => 'ContentNodes', :action => 'show_by_name') end config/router.rb @@ -1,71 +1,6 @@ module Mart - # Should we use live rate calculation via FedEx? - mattr_accessor :use_live_rate_calculation - self.use_live_rate_calculation = false - - # Override SSL production mode? - # If set to true the cart and checkout are accessed via HTTP not HTTPS - # regardless of the mode that the server is run in. - # - # This is useful for me on the demo site where I don't want - # to set up a SSL cert. - mattr_accessor :override_ssl_production_mode - self.override_ssl_production_mode = false - - # For alternating row colors... - def alternate(str1 = "odd", str2 = "even") - @alternate_odd_even_state = true if @alternate_odd_even_state.nil? - @alternate_odd_even_state = !@alternate_odd_even_state - @alternate_odd_even_state ? str2 : str1 - end - - # For linking to sections (using subdirs) - def link_to_section(label, options = {}) - $ctrlop = options[:controller] - if request.request_uri == options[:controller] - link_to(label, options, { :class => "active"}) - else - link_to(label, options) - end - end - - # Gets a link to checkout - # If we're in production mode we go to the HTTPS server - # - def get_link_to_checkout - # For things like the demo site I need to disable SSL - if (Substruct.override_ssl_production_mode == true) then - return "/store/checkout" - elsif ENV['RAILS_ENV'] == "production" then - return "https://#{request.host}/store/checkout" - else - return "/store/checkout" - end - end - - # Generates a navigation string from an array list - def generate_navigation(options, currently_viewing=nil, action='list') - list = "<ul class=\"navigation secondary\">\n" - - options.each do |item| - if currently_viewing == item then - list << "<li class=\"active\">#{item}</li>" - else - list << "<li>" - list << link_to(item, :action => action, :key => item) - list << "</li>" - end - end - - return list << "</ul>" - end - - # Truncates to the nearest word - def truncate_words(text, length = 30, end_string = '') - words = text.split() - words[0..(length-1)].join(' ') + (words.length > length ? end_string : '') - end + end \ No newline at end of file lib/mart.rb LICENSE app/controllers/questions.rb app/models/blog.rb app/models/content_node.rb app/models/order_user.rb app/models/page.rb app/models/preference.rb app/models/question.rb app/models/section.rb app/models/snippet.rb app/views/content_nodes/show_by_name.html.erb app/views/questions/new.html.erb e09b81dd3255346cc794941b10ee05a2af507d5e Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/09233d02a8c662968d61f6defc28fef0ae266615 09233d02a8c662968d61f6defc28fef0ae266615

2008-04-27T12:43:52-07:00

Changed license to GPL License. Updated README to reflect change in design (no longer quick port of Substruct). Renamed OrderUser to Customer. Removed various content management (CMS) models. Removed lines of Artistic License 1.0 encumbered, Substruct copy-and-pasted code from models and views. Added ignore rule for NB projects in .gitignore. Commented out various routing rules. 6ab3efa3bcc3f96c34cc161ef4a785afda0e2463 Alex Coles alexbcoles@mac.com