forked from AdaGold/betsy
    
        
        - 
                Notifications
    You must be signed in to change notification settings 
- Fork 14
karin/alma/maddie/sky (basketcase) #40
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Open
      
      
            wordkarin
  wants to merge
  142
  commits into
  Ada-C6:master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
wordkarin:master
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
                
     Open
            
            
          Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    Fixtures for everyone!
…o existing order fixture
added product validations and wrote the model tests
Merchant validations implemented through TDD
* added a new before_action current_order which allows access to the order_id in session * fixed current_order to session, rather than hardcoded * paying for an order now deletes session[:order_id] * removed redundant before_action
Product#Index Css
Category#Index Css
* Writing orders#update and the order_items.rb methods, WIP passing tests. * Passing tests in order_items model. Working on creating new fixtures for these tests * hooked up add to order button to order/order_item create, fixed bugs
am actually saving order with purchase_time now
…g'. Removed skipped test.
…g'. Model tests pass. Rm skipped test.
ordersnthings
* STYLES OMG: index page, updated reviews, merchant show, category show, product cat and category, form styling. * added merchant name to show page if logged out * fixed title on product edit page, saving a purchased order's time
fixed images on merchant page, background on index
* index page styling * more changes * css * updated reviews * css merchant show * category show * css prodcut cat and cat new * css form styling * merchant show page * added merchant name to show page if logged out * fixed title on product edit page, saving a purchased order's time * css finessing * fixed images on merchant prodcut page * added spacing * spelling
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Our app is deployed to heroku at: https://basketcase-betsy.herokuapp.com/
Our trello is: https://trello.com/b/lhhmzqVw/basket-tasks
Things we were proud of:
Things we would have liked to do: