Merge pull request #906 from inbaz/develop

Merge of payment type and bank account
BigAndini · Feb 12, 2017 · c7f564e · c7f564e
2 parents 986c80e + de70c20
commit c7f564e
Show file tree

Hide file tree

Showing 277 changed files with 4,126 additions and 18,301 deletions.
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "zendframework/zendframework": "2.4.*",
-        "doctrine/doctrine-orm-module": "0.9.*",
+        "zendframework/zendframework": "2.*",
+        "doctrine/doctrine-orm-module": "0.*",
         "zendframework/zend-developer-tools": "1.0.0",
         "ckeditor/ckeditor": "dev-stable",
         "html2text/html2text": "2.0.1",
@@ -34,8 +34,8 @@
         "satsume/ckeditor-module": "dev-master",
         "dudapiotr/zftable": "3.*",
         "org_heigl/piwik" : "1.0.*",
-        "goalio/goalio-rememberme": "1.*",
-        "goalio/goalio-rememberme-doctrine-orm": "1.*",
+        "goalio/goalio-rememberme": "*",
+        "goalio/goalio-rememberme-doctrine-orm": "*",
         "behat/behat": "@stable",
         "behat/mink": "@stable",
         "behat/mink-extension": "@stable",

diff --git a/config/application.config.php b/config/application.config.php
@@ -5,6 +5,8 @@
         'ZfcBase',
         'ZfcUser',
         'ZfcUserDoctrineORM',
+        'GoalioRememberMe',
+        'GoalioRememberMeDoctrineORM',
         'BjyAuthorize',
         #'ZendDeveloperTools',
         'DoctrineModule',
@@ -18,8 +20,6 @@
         'PreReg',
         'OnsiteReg',
         'OrgHeiglPiwik',
-        'GoalioRememberMe',
-        'GoalioRememberMeDoctrineORM',
     ),
 
     // These are various options for the listeners attached to the ModuleManager

diff --git a/config/autoload/bjyauthorize.global.php b/config/autoload/bjyauthorize.global.php
@@ -11,7 +11,9 @@
 
 return [
     'bjyauthorize' => [
-
+        // redirect to login page when user is not authorized
+        #'unauthorized_strategy' => 'BjyAuthorize\View\RedirectionStrategy',
+
         // set the 'guest' role as default (must be defined in a role provider)
         'default_role' => 'guest',
 
@@ -142,16 +144,12 @@
                 ['controller' => 'PreReg\Controller\Cart', 'action' => 'reset',     'roles' => ['guest', 'user']],
                 ['controller' => 'PreReg\Controller\Order',                         'roles' => ['guest', 'user']],
                 ['controller' => 'PreReg\Controller\Payment',                       'roles' => ['guest', 'user']],
-                #['controller' => 'PreReg\Controller\Order', 'action' => 'index',   'roles' => ['guest', 'user']],
-                #['controller' => 'PreReg\Controller\Package',                       'roles' => ['guest', 'user']],
                 ['controller' => 'PreReg\Controller\Product',                       'roles' => ['guest', 'user']],
                 ['controller' => 'PreReg\Controller\Participant',                   'roles' => ['guest', 'user']],
-                ['controller' => 'PreReg\Controller\Buyer',                     'roles' => ['guest', 'user']],
+                ['controller' => 'PreReg\Controller\Buyer',                         'roles' => ['guest', 'user']],
                 ['controller' => 'PreReg\Controller\Test',                          'roles' => ['admin']],
-                #['controller' => 'PreReg\Controller\Profile', 'action' => 'index', 'roles' => ['user']],
 
                 /* ZfcUser */
-                #['controller' => 'zfcuser', 'roles' => ['guest']],
                 ['controller' => 'zfcuser', 'action' => 'login',    'roles' => ['guest']],
                 ['controller' => 'zfcuser', 'action' => 'register', 'roles' => ['guest']],
                 ['controller' => 'zfcuser', 'action' => 'index',    'roles' => ['user']],
@@ -166,12 +164,11 @@
 
                 /* Onsite */
                 ['controller' => 'OnsiteReg\Controller\Index',                'roles' => ['onsitereg', 'admin', 'supradm']],
-                ['controller' => 'OnsiteReg\Controller\Search',                'roles' => ['onsitereg', 'admin', 'supradm']],
-                ['controller' => 'OnsiteReg\Controller\Package',                'roles' => ['onsitereg', 'admin', 'supradm']],
+                ['controller' => 'OnsiteReg\Controller\Search',               'roles' => ['onsitereg', 'admin', 'supradm']],
+                ['controller' => 'OnsiteReg\Controller\Package',              'roles' => ['onsitereg', 'admin', 'supradm']],
                 ['controller' => 'OnsiteReg\Controller\Redirect',             'roles' => ['guest', 'onsitereg', 'admin', 'supradm']],
 
                 /* Admin */
-                #['controller' => 'Admin\Controller\Admin', 'action' => 'index', 'roles' => ['admin']],
                 ['controller' => 'Admin\Controller\Test',                'roles' => ['admin', 'supradm']],
                 ['controller' => 'Admin\Controller\Index',               'roles' => ['preregcoordinator', 'admin', 'supradm']],
                 ['controller' => 'Admin\Controller\Statistic',           'roles' => ['preregcoordinator', 'admin', 'supradm']],
@@ -198,6 +195,7 @@
                 ['controller' => 'Admin\Controller\Refund',              'roles' => ['admin', 'supradm']],
                 ['controller' => 'Admin\Controller\Status',              'roles' => ['admin', 'supradm']],
                 ['controller' => 'Admin\Controller\Overview',            'roles' => ['admin', 'supradm']],
+                ['controller' => 'Admin\Controller\Currency',            'roles' => ['admin', 'supradm']],
 
                 /* Cron */
                 ['controller' => 'Admin\Controller\Cron',  'roles' => ['guest']],

diff --git a/config/autoload/ers.global.php b/config/autoload/ers.global.php
@@ -10,8 +10,8 @@
 # uncomment the return
 # do additional changes in ers.local.php
 
-/*return array(
-    'ERS' => array(
+/*return [
+    'ERS' => [
         'sender_email'      => '[email protected]',
         'name_short'        => "EJC2016",
         'name_with_year'    => "EJC 2016",
@@ -22,31 +22,32 @@
         'start'             => new DateTime('2016-07-30'),
         'end'               => new DateTime('2016-08-07'),
         'registration_info' => 'http://prereg.eja.net',
-        'onsitereg'         => 'https://prereg.eja.net/redirect'
-    ),
+        'onsitereg'         => 'https://prereg.eja.net/redirect',
+        'operator'          => 'Stichting European Juggling Association',
+    ],
     'environment' => 'develop',
     #'environment' => 'testing',
     #'environment' => 'production',
-    'ERS\SEPA' => array(
+    'ERS\SEPA' => [
         'iban'      => 'NL84 INGB 0007 8721 92',
         'bic'       => 'INGBNL2A',
         'owner'     => 'STICHTING EUROPEAN JUGGLING ASSOCIATION',
         'bank'      => 'ING BANK N.V.',
         'country'   => 'Netherlands',
-    )
-    'ERS\iPayment' => array(
+    ],
+    'ERS\iPayment' => [
         'trxuser_id'    => '99999',
         'trx_currency'  => 'EUR',
         'trxpassword'   => '0',
         'sec_key'       => '1234567890',
         'action'        => 'https://ipayment.de/merchant/%account_id%/processor/2.0/',
-    )
-    'orgHeiglPiwik' => array(
+    ],
+    'orgHeiglPiwik' => [
 
         // Always omit a trailing slash!
         'server' => 'prereg.eja.net/analytics',
         'site_id' => 1,
-    ), 
-);
+    ], 
+];
 */
 return array();
diff --git a/config/autoload/zfcuser.global.php b/config/autoload/zfcuser.global.php
@@ -134,7 +134,7 @@
      *
      * Accepted values: boolean true or false
      */
-    //'use_redirect_parameter_if_present' => true,
+    'use_redirect_parameter_if_present' => true,
 
     /**
 	 * Sets the view template for the user login widget

diff --git a/data/ers.mwb b/data/ers.mwb
diff --git a/data/initial.sql b/data/initial.sql
@@ -1,22 +1,30 @@
-/* add roles */
-INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES (NULL, NULL, 'onsitereg', '', '', ''); 
-INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES (NULL, NULL, 'supradm', '', '', ''); 
-INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES (NULL, NULL, 'preregcoordinator', '', '', ''); 
-INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES (NULL, NULL, 'user', '', '', ''); 
-INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES (NULL, NULL, 'admin', '', '', ''); 
-INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES (NULL, NULL, 'guest', '', '', ''); 
-INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES (NULL, NULL, 'participant', '', '', ''); 
+# add roles
+INSERT INTO `role` (`id`, `parent_id`, `roleId`, `active`, `updated`, `created`) VALUES 
+(NULL, NULL, 'onsitereg',         1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'),
+(NULL, NULL, 'supradm',           1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'),
+(NULL, NULL, 'preregcoordinator', 1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'),
+(NULL, NULL, 'user',              1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'),
+(NULL, NULL, 'admin',             1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'),
+(NULL, NULL, 'guest',             1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'),
+(NULL, NULL, 'participant',       1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'); 
+(NULL, NULL, 'buyer',             1, '2017-02-11 13:37:00', '2017-02-11 13:37:00'); 
 
-/* add admin user: [email protected] */
-/* tax examples */
-/* deadline examples */
-/* agegroup examples */
+# add admin user: [email protected]
+# tax examples
+# deadline examples
+# agegroup examples
 
-/* add status */
+# add status
 INSERT INTO `status` (`id`, `position`, `value`, `description`, `updated`, `created`, `active`) VALUES
 (1, 1, 'order pending', '', NULL, NULL, 0),
 (2, 2, 'ordered', '', NULL, NULL, 1),
 (3, 3, 'paid', '', NULL, NULL, 1),
 (4, 4, 'shipped', '', NULL, NULL, 1),
 (5, 5, 'cancelled', '', NULL, NULL, 0),
-(6, 6, 'transferred', '', NULL, NULL, 0);
+(6, 6, 'transferred', '', NULL, NULL, 0);
+
+INSERT INTO `user` (`id`, `username`, `email`, `email_status`, `display_name`, `firstname`, `surname`, `gender`, `Country_id`, `password`, `hashkey`, `state`, `active`, `birthday`, `login_count`, `newsletter`, `updated`, `created`) VALUES 
+(NULL, NULL, '[email protected]', NULL, NULL, 'Andi', 'Nitsche', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL, NULL, '2017-02-11 00:00:00', '2017-02-11 00:00:00');
+
+INSERT INTO `user_has_role` (`user_id`, `role_id`) VALUES 
+('1', '5'); 
diff --git a/module/Admin/config/module.config.php b/module/Admin/config/module.config.php
@@ -35,18 +35,20 @@
             'Admin\Controller\Status'               => 'Admin\Controller\StatusController',
             'Admin\Controller\Test'                 => 'Admin\Controller\TestController',
             'Admin\Controller\Overview'             => 'Admin\Controller\OverviewController',
+            'Admin\Controller\Currency'             => 'Admin\Controller\CurrencyController',
         ),
     ),
     'navigation' => array(
         'admin_main_nav' => array(
-            'home' => array(
+            /*'home' => array(
                 'label' => 'Frontend',
                 'route' => 'home',
                 'target' => '_blank',
                 'resource'  => 'controller/PreReg\Controller\Product',
-            ),
+            ),*/
             'statistic' => array(
                 'label' => 'Stats',
+                'icon' => 'fa fa-bar-chart',
                 'route' => 'admin/statistic',
                 'pages' => array(
                     'orgas' => array(
@@ -67,7 +69,7 @@
                         'action' => 'participants',
                         'resource'  => 'controller/Admin\Controller\Statistic',
                     ),
-                    'bankaccount' => array(
+                    'account' => array(
                         'label' => 'Bank accounts',
                         'route' => 'admin/statistic',
                         'action' => 'bankaccounts',
@@ -83,6 +85,7 @@
             ),
             'shop' => array(
                 'label' => 'Shop',
+                'icon' => 'fa fa-shopping-cart',
                 'route' => 'admin',
                 'pages' => array(
                     'tax' => array(
@@ -100,6 +103,11 @@
                         'route' => 'admin/agegroup',
                         'resource'  => 'controller/Admin\Controller\Agegroup',
                     ),
+                    'currency' => array(
+                        'label' => 'Currency',
+                        'route' => 'admin/currency',
+                        'resource'  => 'controller/Admin\Controller\Currency',
+                    ),
                     'paymenttype' => array(
                         'label' => 'Payment Type',
                         'route' => 'admin/payment-type',
@@ -144,6 +152,7 @@
             ),
             'user' => array(
                 'label' => 'User',
+                'icon' => 'fa fa-users',
                 'route' => 'admin/user',
                 'resource'  => 'controller/Admin\Controller\User',
                 'pages' => array(
@@ -232,39 +241,47 @@
             ),
         ),
         'admin_top_nav' => array(
-            'login' => array(
-                'label' => 'Login',
-                'route' => 'zfcuser/login',
-                #'action' => 'login',
-                'resource'  => 'controller/zfcuser:login',
-            ),
-            'register' => array(
-                'label' => 'Register',
-                'route' => 'zfcuser/register',
-                #'action' => 'register',
-                'resource'  => 'controller/zfcuser:register',
-            ),
             'profile' => array(
-                'label' => 'My Profile',
-                'route' => 'profile',
-                'action' => '',
-                'resource'  => 'controller/PreReg\Controller\Profile',
-            ),
-            'logout' => array(
-                'label' => 'Logout',
-                'route' => 'zfcuser/logout',
-                #'action' => 'logout',
-                'resource'  => 'controller/zfcuser:logout',
-            ),
-            'admin' => array(
-                'label' => 'AdminPanel',
+                'label' => 'Profile',
+                'icon-only-label' => true,
+                'icon' => 'fa fa-user',
                 'route' => 'admin',
-                'resource'  => 'controller/Admin\Controller\Index',
-            ),
-            'onsite' => array(
-                'label' => 'Onsite',
-                'route' => 'onsite',
-                'resource'  => 'controller/OnsiteReg\Controller\Index',
+                'pages' => array(
+                    'login' => array(
+                        'label' => 'Login',
+                        'route' => 'zfcuser/login',
+                        #'action' => 'login',
+                        'resource'  => 'controller/zfcuser:login',
+                    ),
+                    'register' => array(
+                        'label' => 'Register',
+                        'route' => 'zfcuser/register',
+                        #'action' => 'register',
+                        'resource'  => 'controller/zfcuser:register',
+                    ),
+                    'profile' => array(
+                        'label' => 'My Profile',
+                        'route' => 'profile',
+                        'action' => '',
+                        'resource'  => 'controller/PreReg\Controller\Profile',
+                    ),
+                    'logout' => array(
+                        'label' => 'Logout',
+                        'route' => 'zfcuser/logout',
+                        #'action' => 'logout',
+                        'resource'  => 'controller/zfcuser:logout',
+                    ),
+                    'admin' => array(
+                        'label' => 'AdminPanel',
+                        'route' => 'admin',
+                        'resource'  => 'controller/Admin\Controller\Index',
+                    ),
+                    'onsite' => array(
+                        'label' => 'Onsite',
+                        'route' => 'onsite',
+                        'resource'  => 'controller/OnsiteReg\Controller\Index',
+                    ),
+                ),
             ),
         ),
     ),
@@ -633,6 +650,20 @@
                             ),
                         ),
                     ),
+                    'currency' => array(
+                        'type' => 'segment',
+                        'options' => array(
+                            'route'    => '/currency[/:action][/:id]',
+                            'constraints' => array(
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                                'id'     => '[0-9]+',
+                            ),
+                            'defaults' => array(
+                                'controller' => 'Admin\Controller\Currency',
+                                'action' => 'index',
+                            ),
+                        ),
+                    ),
                     'payment-type' => array(
                         'type' => 'segment',
                         'options' => array(