Store + Shipping + Menus

* Using new Store feature from Elcodi * Added Store management in Admin * Changed all definitions that was depending on such implementation * Removed under construction logic and tests * Removed menu fixtures * Defined them as dynamic content. Some of them are generated dinamically, and some of them statically. * Added neede menu builders in every Admin bundle * Changed the way menu is loaded in Admin * Removed dependency with Configuration and Configuration annotation, in order to use new implementation. * Removed configuration elements * Removed all `elcodi_config` twig extension usage * Moved custom shipping logic from elcodi/elcodi to elcodi-plugins/* * Added full repo inside Plugin folder * Using new Shipping engine * Updated some code in order to be compatible with Sf2.7 deprecations Ready for Elcodi Beta! Auu! Auu!
elcodi · Jun 8, 2015 · 8905b3e · 8905b3e
1 parent 8e55243
commit 8905b3e
Show file tree

Hide file tree

Showing 279 changed files with 7,463 additions and 3,641 deletions.
diff --git a/.gitsplit.yml b/.gitsplit.yml
@@ -1,4 +1,3 @@
 split:
     # Split definition for http://gitsplit.com
-    src/Elcodi/Template/*: [email protected]:elcodi-templates/$i.git
     src/Elcodi/Plugin/*: [email protected]:elcodi-plugins/$i.git
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -86,7 +86,6 @@ public function registerBundles()
             new Elcodi\Bundle\TaxBundle\ElcodiTaxBundle(),
             new Elcodi\Bundle\EntityTranslatorBundle\ElcodiEntityTranslatorBundle(),
             new Elcodi\Bundle\StateTransitionMachineBundle\ElcodiStateTransitionMachineBundle(),
-            new Elcodi\Bundle\ConfigurationBundle\ElcodiConfigurationBundle(),
             new Elcodi\Bundle\PageBundle\ElcodiPageBundle(),
             new Elcodi\Bundle\MetricBundle\ElcodiMetricBundle(),
             new Elcodi\Bundle\PluginBundle\ElcodiPluginBundle($this),
@@ -95,6 +94,7 @@ public function registerBundles()
             new Elcodi\Bundle\ShippingBundle\ElcodiShippingBundle(),
             new Elcodi\Bundle\SitemapBundle\ElcodiSitemapBundle(),
             new Elcodi\Bundle\PaymentBundle\ElcodiPaymentBundle(),
+            new Elcodi\Bundle\StoreBundle\ElcodiStoreBundle(),
 
             /**
              * Elcodi store bundle
@@ -133,15 +133,14 @@ public function registerBundles()
             new Elcodi\Admin\PluginBundle\AdminPluginBundle(),
             new Elcodi\Admin\ShippingBundle\AdminShippingBundle(),
             new Elcodi\Admin\GeoBundle\AdminGeoBundle(),
-            new Elcodi\Admin\ConfigurationBundle\AdminConfigurationBundle(),
             new Elcodi\Admin\PaymentBundle\AdminPaymentBundle(),
+            new Elcodi\Admin\StoreBundle\AdminStoreBundle(),
 
             /**
              * Elcodi common bundle
              */
             new Elcodi\Common\FirewallBundle\ElcodiFirewallBundle(),
-            new Elcodi\Common\BambooBundle\ElcodiBambooBundle(),
-            new Elcodi\Common\ConfigurationBundle\ConfigurationAnnotationBundle(),
+            new Elcodi\Common\CommonBundle\ElcodiCommonBundle(),
 
             /**
              * Elcodi Plugins
@@ -157,6 +156,7 @@ public function registerBundles()
             new Elcodi\Plugin\PaypalWebCheckoutBundle\ElcodiPaypalWebCheckoutBundle(),
             new Elcodi\Plugin\FreePaymentBundle\ElcodiFreePaymentBundle(),
             new Elcodi\Plugin\StripeBundle\ElcodiStripeBundle(),
+            new Elcodi\Plugin\CustomShippingBundle\ElcodiCustomShippingBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

diff --git a/app/Resources/views/_base.html.twig b/app/Resources/views/_base.html.twig
@@ -15,7 +15,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>{% block title elcodi_config('store.name') %}</title>
+        <title>{% block title store.name %}</title>
         {% block meta_tags "" %}
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <script type="text/javascript">document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/,'js');</script>

diff --git a/app/config/common/cache.yml b/app/config/common/cache.yml
@@ -15,13 +15,6 @@ doctrine_cache:
             type: redis
             namespace: %elcodi.core.bamboo.cache_prefix%menus
 
-        #
-        # Configuration values cache
-        #
-        elcodi_configurations:
-            type: redis
-            namespace: %elcodi.core.bamboo.cache_prefix%configuration
-
         #
         # Entity translations cache
         #

diff --git a/app/config/common/configuration.yml b/app/config/common/configuration.yml
diff --git a/app/config/common/services.yml b/app/config/common/services.yml
@@ -26,20 +26,4 @@ services:
         arguments:
             - @templating.engine.twig
             - "Layout:_static.html.twig"
-            - [@=elcodi_config("store.template")]
-
-    #
-    # Store tracker
-    #
-    elcodi.store_tracker:
-        class: stdClass
-        factory: [@elcodi.manager.configuration, get]
-        arguments: ['store.tracker']
-
-    #
-    # Store address
-    #
-    elcodi.store_address:
-        class: %elcodi.entity.address.class%
-        factory_service: elcodi.service.store_address_manager
-        factory_method: getStoreAddress
+            - [@elcodi.store_template]
diff --git a/app/config/common/translations.yml b/app/config/common/translations.yml
@@ -40,8 +40,3 @@ elcodi_entity_translator:
                 metaTitle: ~
                 metaDescription: ~
                 metaKeywords: ~
-        Elcodi\Component\Shipping\Entity\Interfaces\CarrierInterface:
-            alias: carrier
-            fields:
-                name: ~
-                description: ~
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -5,7 +5,6 @@ imports:
     # Common Elcodi configuration
     - { resource: common/translations.yml }
     - { resource: common/filesystem.yml }
-    - { resource: common/configuration.yml }
     - { resource: common/cache.yml }
     - { resource: common/twig.yml }
     - { resource: common/metrics.yml }
@@ -46,8 +45,7 @@ twig:
     globals:
         elcodi_context: []
         currency_wrapper: @elcodi.wrapper.currency
-        store_tracker: @elcodi.store_tracker
-        store_address: @elcodi.store_address
+        store: @elcodi.store
 
 # Doctrine Configuration
 doctrine:
@@ -63,6 +61,8 @@ doctrine:
                 charset:  UTF8
 
     orm:
+        resolve_target_entities:
+            Elcodi\Component\Cart\Entity\Interfaces\CartInterface2: Elcodi\Component\Cart\Entity\Cart2
         auto_generate_proxy_classes: "%kernel.debug%"
         entity_managers:
             default:
@@ -76,6 +76,7 @@ assetic:
         - StoreCoreBundle
         - StoreTemplateBundle
         - AdminGeoBundle
+        - AdminStoreBundle
     debug:          "%kernel.debug%"
     use_controller: false
     filters:
@@ -125,10 +126,6 @@ jms_i18n_routing:
 #
 # Elcodi related configuration
 #
-
-elcodi_bamboo:
-    store_tracker: 7s89da7s8d9a
-
 elcodi_media:
     images:
         resize:
@@ -143,11 +140,22 @@ elcodi_media:
 #     mapping:
 #         location:
 #             manager: default
+#
+# For retrieving location data through the API instead of a simple service, you
+# can use the API adapter and configure the host your API is located.
+#
+# elcodi_geo:
+#     location_provider: elcodi.location_provider.api
+#     location_api_host: http://my.server:9090
+#
 
 elcodi_page:
     renderers:
         - bamboo.page.renderer.template_renderer
 
+#
+# Overwrite your Error templates
+#
 store_core:
     error_templates:
         fallback: true

diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -28,10 +28,3 @@ doctrine:
 web_profiler:
     toolbar: false
     intercept_redirects: false
-
-elcodi_bamboo:
-    cache_prefix:         ''
-    store_name:           'Elcodi Store'
-    store_tracker:        '101010101010'
-    store_enabled:        true
-    store_under_construction:  false
diff --git a/app/config/routing/routing.yml b/app/config/routing/routing.yml
@@ -29,6 +29,7 @@ admin_routes:
 #
 api_routes:
     resource: "routing_api.yml"
+    prefix: /%bamboo_api_prefix%
     options:
         i18n: false
 

diff --git a/app/config/routing/routing_admin.yml b/app/config/routing/routing_admin.yml
@@ -25,9 +25,6 @@ admin_attribute:
 admin_product:
     resource: "@AdminProductBundle/Resources/config/routing.yml"
 
-admin_shipping:
-    resource: "@AdminShippingBundle/Resources/config/routing.yml"
-
 admin_media:
     resource: "@AdminMediaBundle/Resources/config/routing.yml"
 
@@ -37,9 +34,6 @@ admin_newsletter:
 admin_page:
     resource: "@AdminPageBundle/Resources/config/routing.yml"
 
-admin_configuration:
-    resource: "@AdminConfigurationBundle/Resources/config/routing.yml"
-
 admin_templates:
     resource: "@AdminTemplateBundle/Resources/config/routing.yml"
 
@@ -55,8 +49,8 @@ admin_geo:
 admin_languages:
     resource: "@AdminLanguageBundle/Resources/config/routing.yml"
 
-admin_payments:
-    resource: "@AdminPaymentBundle/Resources/config/routing.yml"
+admin_store:
+    resource: "@AdminStoreBundle/Resources/config/routing.yml"
 
 admin_login_check:
     path:  /login_check

diff --git a/app/config/routing/routing_store.yml b/app/config/routing/routing_store.yml
@@ -43,7 +43,7 @@ store_hwi_oauth_login:
     prefix:   /login
 
 store_github_login:
-    pattern: /login/check-github
+    path: /login/check-github
 
 store_paypal_login:
-    pattern: /login/check-paypal
+    path: /login/check-paypal
diff --git a/app/config/security/accessControl.yml b/app/config/security/accessControl.yml
@@ -15,14 +15,6 @@ security:
             roles: ROLE_ADMIN
 
         # store
-        login_area:
-            path: ^/login.*
-            roles: IS_AUTHENTICATED_ANONYMOUSLY
-
-        password_area:
-            path: ^/password.*
-            roles: IS_AUTHENTICATED_ANONYMOUSLY
-
         public_area:
             path: ^/.*
             roles: IS_AUTHENTICATED_ANONYMOUSLY