Changeset 423 for 2.0

Timestamp:

05/12/08 18:28:15 (2 months ago)

Author:

pablo

Message:

--

Files:

• 2.0/trunk/app/app_controller.php (modified) (6 diffs)
• 2.0/trunk/app/config/routes.php (modified) (1 diff)
• 2.0/trunk/app/controllers/account_controller.php (added)
• 2.0/trunk/app/controllers/categories_controller.php (modified) (2 diffs)
• 2.0/trunk/app/controllers/checkout_controller.php (added)
• 2.0/trunk/app/controllers/customer_addresses_controller.php (modified) (1 diff)
• 2.0/trunk/app/controllers/customers_controller.php (modified) (1 diff)
• 2.0/trunk/app/controllers/order_items_controller.php (modified) (2 diffs)
• 2.0/trunk/app/controllers/store_controller.php (modified) (5 diffs)
• 2.0/trunk/app/controllers/users_controller.php (modified) (2 diffs)
• 2.0/trunk/app/models/brand.php (modified) (1 diff)
• 2.0/trunk/app/models/category.php (modified) (1 diff)
• 2.0/trunk/app/models/country.php (modified) (1 diff)
• 2.0/trunk/app/models/customer.php (modified) (1 diff)
• 2.0/trunk/app/models/customer_address.php (modified) (1 diff)
• 2.0/trunk/app/models/order.php (modified) (1 diff)
• 2.0/trunk/app/models/order_payment.php (modified) (1 diff)
• 2.0/trunk/app/models/order_status.php (modified) (1 diff)
• 2.0/trunk/app/models/product.php (modified) (1 diff)
• 2.0/trunk/app/models/product_image.php (modified) (1 diff)
• 2.0/trunk/app/models/product_type.php (modified) (1 diff)
• 2.0/trunk/app/models/setting.php (modified) (1 diff)
• 2.0/trunk/app/models/shipping_rate.php (modified) (1 diff)
• 2.0/trunk/app/models/user.php (modified) (1 diff)
• 2.0/trunk/app/views/account (added)
• 2.0/trunk/app/views/account/index.ctp (added)
• 2.0/trunk/app/views/checkout (added)
• 2.0/trunk/app/views/checkout/confirm.ctp (added)
• 2.0/trunk/app/views/checkout/index.ctp (added)
• 2.0/trunk/app/views/checkout/payment.ctp (added)
• 2.0/trunk/app/views/checkout/thankyou.ctp (added)
• 2.0/trunk/app/views/customer_addresses/admin_add.ctp (modified) (1 diff)
• 2.0/trunk/app/views/customer_addresses/admin_edit.ctp (modified) (1 diff)
• 2.0/trunk/app/views/customer_addresses/admin_view.ctp (modified) (1 diff)
• 2.0/trunk/app/views/elements/store_mini_cart.ctp (modified) (1 diff)
• 2.0/trunk/app/views/layouts/admin.ctp (modified) (3 diffs)
• 2.0/trunk/app/views/layouts/admin_login.ctp (modified) (2 diffs)
• 2.0/trunk/app/views/layouts/default.ctp (modified) (1 diff)
• 2.0/trunk/app/views/layouts/store.ctp (modified) (2 diffs)
• 2.0/trunk/app/views/orders/admin_add.ctp (modified) (1 diff)
• 2.0/trunk/app/views/orders/admin_edit.ctp (modified) (1 diff)
• 2.0/trunk/app/views/orders/admin_view.ctp (modified) (1 diff)
• 2.0/trunk/app/views/store/cart.ctp (modified) (2 diffs)
• 2.0/trunk/app/views/store/checkout.ctp (deleted)
• 2.0/trunk/app/views/store/flypage.ctp (modified) (1 diff)
• 2.0/trunk/app/views/store/login.ctp (modified) (1 diff)
• 2.0/trunk/app/views/store/payment.ctp (deleted)
• 2.0/trunk/app/views/store/register.ctp (modified) (1 diff)
• 2.0/trunk/app/views/users/login.ctp (modified) (1 diff)
• 2.0/trunk/app/webroot/css/admin.css (modified) (3 diffs)
• 2.0/trunk/app/webroot/css/store.css (modified) (7 diffs)
• 2.0/trunk/app/webroot/img/phpshop.icon.png (modified) (previous)

2.0/trunk/app/app_controller.php

@@ -28 +28 @@
-        
-        var $helpers = array('Html','Javascript');
-        //var $uses = array('Setting');
-
-        /* Enabling Json handler */
-        var $components = array('RequestHandler');
-        function setContent() {
-                $this->RequestHandler->setContent('json', 'text/x-json');
-        }
-        
-        /**
@@ -43 +36 @@
-         function beforeFilter() {      
-        
-                // Json setup
-                $this->setContent();
-        
-        
-                // load configuration settings and save them globally
-                
@@ -52 +41 @@
-                // PS_INSTALLED needs to be defined in database.php.  this is done by the installer
-                if (defined('PS_INSTALLED')) {
+                        
-                        App::import('Model', 'Setting');
-                        $setting =& new Setting();
@@ -59 +49 @@
-                        Configure::write($settings);
-                }
-               
+
-                // request login if admin route
-                if (isset($this->params[Configure::read('Routing.admin')])) {
-
+Admin
-                }
-         }
-
+        /**
+         * Called before every render.
+         *
+         */     
-         function beforeRender() {
-
@@ -74 +68 @@
-         }
-
-
+
+
+
+
+
-    {
-        // If the session info hasn't been set...
@@ -85 +83 @@
-        else return true;
-    }
+
+
+        /**
+        * Customer validation
+        */
+    function checkSession()
+    {
+        // If the session info hasn't been set...
+        if (!$this->Session->check('Customer'))
+        {
+            // Force the user to login
+            $this->redirect('/store/login');
+            exit();
+        }
+    }
- }
- ?>

2.0/trunk/app/config/routes.php

@@ -43 +43 @@
- * developement.
- */
-
+//
-        
-/** 
- * Adding Json parser extension 
-**/     
-        Router::parseExtensions('json'); 
-?>

2.0/trunk/app/controllers/categories_controller.php

@@ -1 +1 @@
-<?php
-:
+
-/**
- *
@@ -90 +90 @@
-                        $this->redirect(array('action'=>'index'));
-                }
+                
+                $category = $this->Category->read(null, $id);
+                if ($category['Category']['handle'] == 'home') {
+                        $this->Session->setFlash(__('Category \'home\' must not be deleted.', true));
+                        $this->redirect(array('action'=>'index'));                      
+                }
-                if ($this->Category->del($id)) {
-                        $this->Session->setFlash(__('Category deleted', true));

2.0/trunk/app/controllers/customer_addresses_controller.php

@@ -52 +52 @@
-                        } else {
-                                $this->Session->setFlash(__('The CustomerAddress could not be saved. Please, try again.', true));
+                                $customer_id = $this->data['CustomerAddress']['customer_id'];           
-                        }
-                }
+                else {
+                        $customer_id = $this->passedArgs['customer_id'];                
+                }
-
-                $customer_id = $this->passedArgs['customer_id'];
-                $this->set('customer_id', $customer_id);
-                

2.0/trunk/app/controllers/customers_controller.php

@@ -92 +92 @@
-                }
-        }
-
-}
-?>

2.0/trunk/app/controllers/order_items_controller.php

@@ -47 +47 @@
-
-        function admin_add($order_id=null) {
+                
+                
-                if (!empty($this->data)) {
-                        $this->OrderItem->create();
@@ -54 +56 @@
-                        } else {
-                                $this->Session->setFlash(__('The OrderItem could not be saved. Please, try again.', true));
+                                $order_id = $this->data['OrderItem']['order_id'];
-                        }
-                }
+                else {
+                        $order_id = $this->passedArgs['order_id'];                      
+                }
+                $this->set('order_id', $order_id);
-                
-                $orderShipments = $this->OrderItem->OrderShipment->find('list');
-                $order_id = $this->passedArgs['order_id'];
-                $this->set('order_id', $order_id);
-                $productItems = $this->ProductItem->find('list');
-                $this->set(compact('orderShipments', 'productItems'));

2.0/trunk/app/controllers/store_controller.php

@@ -55 +55 @@
-                                          'Order',
-                                          'OrderItem',
+                                          'OrderStatus',
-                                          'Country',
-                                          'Zone',
-
+
+
+
-                                          );
-        
@@ -64 +67 @@
-        *
-        */
-
+$category_handle=null
-                
-                $this->redirect(array('action' => 'browse', 'home'));
@@ -141 +144 @@
-                $this->set('products', $this->Cart->get_contents());            
-                $this->set('cart_total', $this->Cart->cart_total());
+
+                // turn off minicart
+                $this->set('mini_cart', true);
-                
-                // set page title
-                $this->pageTitle = Configure::read('Store.name') .  ' - ' . __('Shopping Cart', true);
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-                // set page title
-Checkout
+Register
-
-                if (!$this->Session->read('Cart')) {
@@ -160 +213 @@
-                } 
-                
+                // get customer information
+                $registration = $this->Session->read('Registration');
+                
+                // build drop down lists                
-                $this->set('countries', $this->Country->find("list"));
+                $this->set('states', $this->Zone->find("list"));
-                $this->set('cart_items', $this->Cart->get_contents());          
-                $this->set('cart_total', $this->Cart->cart_total());
@@ -166 +224 @@
-                // save order
-                if (!empty($this->data)) {
+                        
+                        $customer = $this->data;        
+
+                        // set email and password from previos page.
+                        $customer['Customer']['email']= $registration['Customer']['email'];
+                        $customer['Customer']['password']= $registration['Customer']['password'];
+                        
+                        // need to resolve text versions of country and state
+                        $state = $this->Zone->read(null, $customer['Customer']['billing_state_id']);
+                        $customer['Customer']['zone_id'] = $customer['Customer']['billing_state_id'];
+                        $customer['Customer']['country_id'] = $customer['Customer']['billing_country_id'];
-                                                
-                        // save order data
-                        $order = $this->data;   
-                        
-                        // If shipping is the same as billing, let's copy it.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}

2.0/trunk/app/controllers/users_controller.php

@@ -86 +86 @@
-        function login()
-    {
+                $this->pageTitle = "Login";
-                $this->layout = 'admin_login';
-                
@@ -124 +125 @@
-                // to a landing page for the application.
-
-setting
+order
-            }
-            // Else, they supplied incorrect data:

2.0/trunk/app/models/brand.php

@@ -28 +28 @@
-
-        var $name = 'Brand';
+        
+        var $validate = array(
+                'name' => VALID_NOT_EMPTY,
+                'handle' => VALID_NOT_EMPTY,
+        );
-
-        //The Associations below have been created with all possible keys, those that are not needed can be removed

2.0/trunk/app/models/category.php

@@ -31 +31 @@
-        
-        var $validate = array(
-
-
-
-
-
-
-
-
-
+
+
+
-        );
-

2.0/trunk/app/models/country.php

@@ -29 +29 @@
-        var $name = 'Country';
-        var $validate = array(
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        );
-

2.0/trunk/app/models/customer.php

@@ -41 +41 @@
-            'required' => true
-        ), 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+