@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | 'label' => 'Customer address ID', |
| 27 | 27 | 'code' => 'customer.address.id', |
| 28 | 28 | 'internalcode' => 'lvuad."id"', |
| 29 | - 'internaldeps' => array( 'LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )' ), |
|
| 29 | + 'internaldeps' => array('LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )'), |
|
| 30 | 30 | 'type' => 'integer', |
| 31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
| 32 | 32 | 'public' => false, |
@@ -223,11 +223,11 @@ discard block |
||
| 223 | 223 | * |
| 224 | 224 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 225 | 225 | */ |
| 226 | - public function cleanup( array $siteids ) |
|
| 226 | + public function cleanup(array $siteids) |
|
| 227 | 227 | { |
| 228 | 228 | $path = 'mshop/customer/manager/address/submanagers'; |
| 229 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
| 230 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 229 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
| 230 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 231 | 231 | } |
| 232 | 232 | } |
| 233 | 233 | |
@@ -237,10 +237,10 @@ discard block |
||
| 237 | 237 | * |
| 238 | 238 | * @param array $ids List of IDs |
| 239 | 239 | */ |
| 240 | - public function deleteItems( array $ids ) |
|
| 240 | + public function deleteItems(array $ids) |
|
| 241 | 241 | { |
| 242 | 242 | $path = 'mshop/customer/manager/address/laravel/delete'; |
| 243 | - $this->deleteItemsBase( $ids, $path, false ); |
|
| 243 | + $this->deleteItemsBase($ids, $path, false); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | |
@@ -250,11 +250,11 @@ discard block |
||
| 250 | 250 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 251 | 251 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 252 | 252 | */ |
| 253 | - public function getSearchAttributes( $withsub = true ) |
|
| 253 | + public function getSearchAttributes($withsub = true) |
|
| 254 | 254 | { |
| 255 | 255 | $path = 'mshop/customer/manager/address/submanagers'; |
| 256 | 256 | |
| 257 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
| 257 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | |
@@ -265,9 +265,9 @@ discard block |
||
| 265 | 265 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 266 | 266 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 267 | 267 | */ |
| 268 | - public function getSubManager( $manager, $name = null ) |
|
| 268 | + public function getSubManager($manager, $name = null) |
|
| 269 | 269 | { |
| 270 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
| 270 | + return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | |
@@ -8,153 +8,153 @@ |
||
| 8 | 8 | |
| 9 | 9 | return array( |
| 10 | 10 | 'table' => array( |
| 11 | - 'users' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 12 | - |
|
| 13 | - $table = $schema->createTable( 'users' ); |
|
| 14 | - |
|
| 15 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 16 | - $table->addColumn( 'siteid', 'integer', array( 'notnull' => false ) ); |
|
| 17 | - $table->addColumn( 'label', 'string', array( 'length' => 255, 'default' => '' ) ); |
|
| 18 | - $table->addColumn( 'name', 'string', array( 'length' => 255 ) ); |
|
| 19 | - $table->addColumn( 'remember_token', 'string', array( 'length' => 100, 'notnull' => false ) ); |
|
| 20 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) ); |
|
| 21 | - $table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) ); |
|
| 22 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
| 23 | - $table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
| 24 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
| 25 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
| 26 | - $table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 27 | - $table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 28 | - $table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 29 | - $table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) ); |
|
| 30 | - $table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 31 | - $table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
| 32 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
| 33 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
| 34 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
| 35 | - $table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
| 36 | - $table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) ); |
|
| 37 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
| 38 | - $table->addColumn( 'password', 'string', array( 'length' => 255 ) ); |
|
| 39 | - $table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 40 | - $table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 41 | - $table->addColumn( 'birthday', 'date', array( 'notnull' => false ) ); |
|
| 42 | - $table->addColumn( 'vdate', 'date', array( 'notnull' => false ) ); |
|
| 43 | - $table->addColumn( 'status', 'smallint', array( 'default' => 1 ) ); |
|
| 44 | - $table->addColumn( 'updated_at', 'datetime', [] ); |
|
| 45 | - $table->addColumn( 'created_at', 'datetime', [] ); |
|
| 46 | - $table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) ); |
|
| 47 | - |
|
| 48 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvusr_id' ); |
|
| 49 | - $table->addUniqueIndex( array( 'email' ), 'unq_lvusr_email' ); |
|
| 50 | - $table->addIndex( array( 'langid' ), 'idx_lvusr_langid' ); |
|
| 51 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvusr_last_first' ); |
|
| 52 | - $table->addIndex( array( 'postal', 'address1' ), 'idx_lvusr_post_addr1' ); |
|
| 53 | - $table->addIndex( array( 'postal', 'city' ), 'idx_lvusr_post_city' ); |
|
| 54 | - $table->addIndex( array( 'lastname' ), 'idx_lvusr_lastname' ); |
|
| 55 | - $table->addIndex( array( 'address1' ), 'idx_lvusr_address1' ); |
|
| 56 | - $table->addIndex( array( 'city' ), 'idx_lvusr_city' ); |
|
| 11 | + 'users' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 12 | + |
|
| 13 | + $table = $schema->createTable('users'); |
|
| 14 | + |
|
| 15 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 16 | + $table->addColumn('siteid', 'integer', array('notnull' => false)); |
|
| 17 | + $table->addColumn('label', 'string', array('length' => 255, 'default' => '')); |
|
| 18 | + $table->addColumn('name', 'string', array('length' => 255)); |
|
| 19 | + $table->addColumn('remember_token', 'string', array('length' => 100, 'notnull' => false)); |
|
| 20 | + $table->addColumn('salutation', 'string', array('length' => 8, 'default' => '')); |
|
| 21 | + $table->addColumn('company', 'string', array('length' => 100, 'default' => '')); |
|
| 22 | + $table->addColumn('vatid', 'string', array('length' => 32, 'default' => '')); |
|
| 23 | + $table->addColumn('title', 'string', array('length' => 64, 'default' => '')); |
|
| 24 | + $table->addColumn('firstname', 'string', array('length' => 64, 'default' => '')); |
|
| 25 | + $table->addColumn('lastname', 'string', array('length' => 64, 'default' => '')); |
|
| 26 | + $table->addColumn('address1', 'string', array('length' => 200, 'default' => '')); |
|
| 27 | + $table->addColumn('address2', 'string', array('length' => 200, 'default' => '')); |
|
| 28 | + $table->addColumn('address3', 'string', array('length' => 200, 'default' => '')); |
|
| 29 | + $table->addColumn('postal', 'string', array('length' => 16, 'default' => '')); |
|
| 30 | + $table->addColumn('city', 'string', array('length' => 200, 'default' => '')); |
|
| 31 | + $table->addColumn('state', 'string', array('length' => 200, 'default' => '')); |
|
| 32 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
| 33 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
| 34 | + $table->addColumn('telephone', 'string', array('length' => 32, 'default' => '')); |
|
| 35 | + $table->addColumn('telefax', 'string', array('length' => 32, 'default' => '')); |
|
| 36 | + $table->addColumn('website', 'string', array('length' => 255, 'default' => '')); |
|
| 37 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
| 38 | + $table->addColumn('password', 'string', array('length' => 255)); |
|
| 39 | + $table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 40 | + $table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 41 | + $table->addColumn('birthday', 'date', array('notnull' => false)); |
|
| 42 | + $table->addColumn('vdate', 'date', array('notnull' => false)); |
|
| 43 | + $table->addColumn('status', 'smallint', array('default' => 1)); |
|
| 44 | + $table->addColumn('updated_at', 'datetime', []); |
|
| 45 | + $table->addColumn('created_at', 'datetime', []); |
|
| 46 | + $table->addColumn('editor', 'string', array('length' => 255, 'default' => '')); |
|
| 47 | + |
|
| 48 | + $table->setPrimaryKey(array('id'), 'pk_lvusr_id'); |
|
| 49 | + $table->addUniqueIndex(array('email'), 'unq_lvusr_email'); |
|
| 50 | + $table->addIndex(array('langid'), 'idx_lvusr_langid'); |
|
| 51 | + $table->addIndex(array('lastname', 'firstname'), 'idx_lvusr_last_first'); |
|
| 52 | + $table->addIndex(array('postal', 'address1'), 'idx_lvusr_post_addr1'); |
|
| 53 | + $table->addIndex(array('postal', 'city'), 'idx_lvusr_post_city'); |
|
| 54 | + $table->addIndex(array('lastname'), 'idx_lvusr_lastname'); |
|
| 55 | + $table->addIndex(array('address1'), 'idx_lvusr_address1'); |
|
| 56 | + $table->addIndex(array('city'), 'idx_lvusr_city'); |
|
| 57 | 57 | |
| 58 | 58 | return $schema; |
| 59 | 59 | }, |
| 60 | 60 | |
| 61 | - 'users_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 62 | - |
|
| 63 | - $table = $schema->createTable( 'users_address' ); |
|
| 64 | - |
|
| 65 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 66 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 67 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
| 68 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); |
|
| 69 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); |
|
| 70 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); |
|
| 71 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); |
|
| 72 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); |
|
| 73 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); |
|
| 74 | - $table->addColumn( 'address1', 'string', array( 'length' => 200 ) ); |
|
| 75 | - $table->addColumn( 'address2', 'string', array( 'length' => 200 ) ); |
|
| 76 | - $table->addColumn( 'address3', 'string', array( 'length' => 200 ) ); |
|
| 77 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); |
|
| 78 | - $table->addColumn( 'city', 'string', array( 'length' => 200 ) ); |
|
| 79 | - $table->addColumn( 'state', 'string', array( 'length' => 200 ) ); |
|
| 80 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
| 81 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
| 82 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); |
|
| 83 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
| 84 | - $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); |
|
| 85 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); |
|
| 86 | - $table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 87 | - $table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
| 88 | - $table->addColumn( 'flag', 'integer', [] ); |
|
| 89 | - $table->addColumn( 'pos', 'smallint', [] ); |
|
| 90 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 91 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 92 | - $table->addColumn( 'editor', 'string', array('length' => 255 ) ); |
|
| 93 | - |
|
| 94 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvuad_id' ); |
|
| 95 | - $table->addIndex( array( 'parentid' ), 'idx_lvuad_pid' ); |
|
| 96 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvuad_last_first' ); |
|
| 97 | - $table->addIndex( array( 'postal', 'address1' ), 'idx_lvuad_post_addr1' ); |
|
| 98 | - $table->addIndex( array( 'postal', 'city' ), 'idx_lvuad_post_city' ); |
|
| 99 | - $table->addIndex( array( 'address1' ), 'idx_lvuad_address1' ); |
|
| 100 | - $table->addIndex( array( 'city' ), 'idx_lvuad_city' ); |
|
| 101 | - $table->addIndex( array( 'email' ), 'idx_lvuad_email' ); |
|
| 61 | + 'users_address' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 62 | + |
|
| 63 | + $table = $schema->createTable('users_address'); |
|
| 64 | + |
|
| 65 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 66 | + $table->addColumn('siteid', 'integer', []); |
|
| 67 | + $table->addColumn('parentid', 'integer', []); |
|
| 68 | + $table->addColumn('company', 'string', array('length' => 100)); |
|
| 69 | + $table->addColumn('vatid', 'string', array('length' => 32)); |
|
| 70 | + $table->addColumn('salutation', 'string', array('length' => 8)); |
|
| 71 | + $table->addColumn('title', 'string', array('length' => 64)); |
|
| 72 | + $table->addColumn('firstname', 'string', array('length' => 64)); |
|
| 73 | + $table->addColumn('lastname', 'string', array('length' => 64)); |
|
| 74 | + $table->addColumn('address1', 'string', array('length' => 200)); |
|
| 75 | + $table->addColumn('address2', 'string', array('length' => 200)); |
|
| 76 | + $table->addColumn('address3', 'string', array('length' => 200)); |
|
| 77 | + $table->addColumn('postal', 'string', array('length' => 16)); |
|
| 78 | + $table->addColumn('city', 'string', array('length' => 200)); |
|
| 79 | + $table->addColumn('state', 'string', array('length' => 200)); |
|
| 80 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
| 81 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
| 82 | + $table->addColumn('telephone', 'string', array('length' => 32)); |
|
| 83 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
| 84 | + $table->addColumn('telefax', 'string', array('length' => 255)); |
|
| 85 | + $table->addColumn('website', 'string', array('length' => 255)); |
|
| 86 | + $table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 87 | + $table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
| 88 | + $table->addColumn('flag', 'integer', []); |
|
| 89 | + $table->addColumn('pos', 'smallint', []); |
|
| 90 | + $table->addColumn('mtime', 'datetime', []); |
|
| 91 | + $table->addColumn('ctime', 'datetime', []); |
|
| 92 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 93 | + |
|
| 94 | + $table->setPrimaryKey(array('id'), 'pk_lvuad_id'); |
|
| 95 | + $table->addIndex(array('parentid'), 'idx_lvuad_pid'); |
|
| 96 | + $table->addIndex(array('lastname', 'firstname'), 'idx_lvuad_last_first'); |
|
| 97 | + $table->addIndex(array('postal', 'address1'), 'idx_lvuad_post_addr1'); |
|
| 98 | + $table->addIndex(array('postal', 'city'), 'idx_lvuad_post_city'); |
|
| 99 | + $table->addIndex(array('address1'), 'idx_lvuad_address1'); |
|
| 100 | + $table->addIndex(array('city'), 'idx_lvuad_city'); |
|
| 101 | + $table->addIndex(array('email'), 'idx_lvuad_email'); |
|
| 102 | 102 | |
| 103 | 103 | return $schema; |
| 104 | 104 | }, |
| 105 | 105 | |
| 106 | - 'users_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 106 | + 'users_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 107 | 107 | |
| 108 | - $table = $schema->createTable( 'users_list_type' ); |
|
| 108 | + $table = $schema->createTable('users_list_type'); |
|
| 109 | 109 | |
| 110 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 111 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 112 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 113 | - $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); |
|
| 114 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); |
|
| 115 | - $table->addColumn( 'status', 'smallint', [] ); |
|
| 116 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 117 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 118 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 110 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 111 | + $table->addColumn('siteid', 'integer', []); |
|
| 112 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 113 | + $table->addColumn('code', 'string', array('length' => 32)); |
|
| 114 | + $table->addColumn('label', 'string', array('length' => 255)); |
|
| 115 | + $table->addColumn('status', 'smallint', []); |
|
| 116 | + $table->addColumn('mtime', 'datetime', []); |
|
| 117 | + $table->addColumn('ctime', 'datetime', []); |
|
| 118 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 119 | 119 | |
| 120 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvulity_id' ); |
|
| 121 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_lvulity_sid_dom_code' ); |
|
| 122 | - $table->addIndex( array( 'siteid', 'status' ), 'idx_lvulity_sid_status' ); |
|
| 123 | - $table->addIndex( array( 'siteid', 'label' ), 'idx_lvulity_sid_label' ); |
|
| 124 | - $table->addIndex( array( 'siteid', 'code' ), 'idx_lvulity_sid_code' ); |
|
| 120 | + $table->setPrimaryKey(array('id'), 'pk_lvulity_id'); |
|
| 121 | + $table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_lvulity_sid_dom_code'); |
|
| 122 | + $table->addIndex(array('siteid', 'status'), 'idx_lvulity_sid_status'); |
|
| 123 | + $table->addIndex(array('siteid', 'label'), 'idx_lvulity_sid_label'); |
|
| 124 | + $table->addIndex(array('siteid', 'code'), 'idx_lvulity_sid_code'); |
|
| 125 | 125 | |
| 126 | 126 | return $schema; |
| 127 | 127 | }, |
| 128 | 128 | |
| 129 | - 'users_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 130 | - |
|
| 131 | - $table = $schema->createTable( 'users_list' ); |
|
| 132 | - |
|
| 133 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 134 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
| 135 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
| 136 | - $table->addColumn( 'typeid', 'integer', [] ); |
|
| 137 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 138 | - $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); |
|
| 139 | - $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); |
|
| 140 | - $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); |
|
| 141 | - $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); |
|
| 142 | - $table->addColumn( 'pos', 'integer', [] ); |
|
| 143 | - $table->addColumn( 'status', 'smallint', [] ); |
|
| 144 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
| 145 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
| 146 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 147 | - |
|
| 148 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvuli_id' ); |
|
| 149 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_lvuli_sid_dm_rid_tid_pid' ); |
|
| 150 | - $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_lvuli_sid_stat_start_end' ); |
|
| 151 | - $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_lvuli_pid_sid_rid_dom_tid' ); |
|
| 152 | - $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_lvuli_pid_sid_start' ); |
|
| 153 | - $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_lvuli_pid_sid_end' ); |
|
| 154 | - $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_lvuli_pid_sid_pos' ); |
|
| 155 | - |
|
| 156 | - $table->addForeignKeyConstraint( 'users_list_type', array( 'typeid' ), array( 'id' ), |
|
| 157 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuli_typeid' ); |
|
| 129 | + 'users_list' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 130 | + |
|
| 131 | + $table = $schema->createTable('users_list'); |
|
| 132 | + |
|
| 133 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 134 | + $table->addColumn('parentid', 'integer', []); |
|
| 135 | + $table->addColumn('siteid', 'integer', []); |
|
| 136 | + $table->addColumn('typeid', 'integer', []); |
|
| 137 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 138 | + $table->addColumn('refid', 'string', array('length' => 32)); |
|
| 139 | + $table->addColumn('start', 'datetime', array('notnull' => false)); |
|
| 140 | + $table->addColumn('end', 'datetime', array('notnull' => false)); |
|
| 141 | + $table->addColumn('config', 'text', array('length' => 0xffff)); |
|
| 142 | + $table->addColumn('pos', 'integer', []); |
|
| 143 | + $table->addColumn('status', 'smallint', []); |
|
| 144 | + $table->addColumn('mtime', 'datetime', []); |
|
| 145 | + $table->addColumn('ctime', 'datetime', []); |
|
| 146 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 147 | + |
|
| 148 | + $table->setPrimaryKey(array('id'), 'pk_lvuli_id'); |
|
| 149 | + $table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_lvuli_sid_dm_rid_tid_pid'); |
|
| 150 | + $table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_lvuli_sid_stat_start_end'); |
|
| 151 | + $table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_lvuli_pid_sid_rid_dom_tid'); |
|
| 152 | + $table->addIndex(array('parentid', 'siteid', 'start'), 'idx_lvuli_pid_sid_start'); |
|
| 153 | + $table->addIndex(array('parentid', 'siteid', 'end'), 'idx_lvuli_pid_sid_end'); |
|
| 154 | + $table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_lvuli_pid_sid_pos'); |
|
| 155 | + |
|
| 156 | + $table->addForeignKeyConstraint('users_list_type', array('typeid'), array('id'), |
|
| 157 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuli_typeid'); |
|
| 158 | 158 | |
| 159 | 159 | return $schema; |
| 160 | 160 | }, |
@@ -240,11 +240,11 @@ discard block |
||
| 240 | 240 | * |
| 241 | 241 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 242 | 242 | */ |
| 243 | - public function cleanup( array $siteids ) |
|
| 243 | + public function cleanup(array $siteids) |
|
| 244 | 244 | { |
| 245 | 245 | $path = 'mshop/customer/manager/submanagers'; |
| 246 | - foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) { |
|
| 247 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 246 | + foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) { |
|
| 247 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | public function createItem() |
| 258 | 258 | { |
| 259 | - return $this->createItemBase( ['customer.siteid' => $this->getContext()->getLocale()->getSiteId()] ); |
|
| 259 | + return $this->createItemBase(['customer.siteid' => $this->getContext()->getLocale()->getSiteId()]); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | |
@@ -265,10 +265,10 @@ discard block |
||
| 265 | 265 | * |
| 266 | 266 | * @param array $ids List of IDs |
| 267 | 267 | */ |
| 268 | - public function deleteItems( array $ids ) |
|
| 268 | + public function deleteItems(array $ids) |
|
| 269 | 269 | { |
| 270 | 270 | $path = 'mshop/customer/manager/laravel/delete'; |
| 271 | - $this->deleteItemsBase( $ids, $path, false ); |
|
| 271 | + $this->deleteItemsBase($ids, $path, false); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | |
@@ -278,11 +278,11 @@ discard block |
||
| 278 | 278 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 279 | 279 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 280 | 280 | */ |
| 281 | - public function getSearchAttributes( $withsub = true ) |
|
| 281 | + public function getSearchAttributes($withsub = true) |
|
| 282 | 282 | { |
| 283 | 283 | $path = 'mshop/customer/manager/submanagers'; |
| 284 | 284 | |
| 285 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub ); |
|
| 285 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array('address', 'lists'), $withsub); |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | |
@@ -292,27 +292,27 @@ discard block |
||
| 292 | 292 | * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object |
| 293 | 293 | * @param boolean $fetch True if the new ID should be returned in the item |
| 294 | 294 | */ |
| 295 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) |
|
| 295 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) |
|
| 296 | 296 | { |
| 297 | 297 | $iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface'; |
| 298 | - if( !( $item instanceof $iface ) ) { |
|
| 299 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) ); |
|
| 298 | + if (!($item instanceof $iface)) { |
|
| 299 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface)); |
|
| 300 | 300 | } |
| 301 | 301 | |
| 302 | - if( !$item->isModified() ) { return; } |
|
| 302 | + if (!$item->isModified()) { return; } |
|
| 303 | 303 | |
| 304 | 304 | $context = $this->getContext(); |
| 305 | 305 | $dbm = $context->getDatabaseManager(); |
| 306 | 306 | $dbname = $this->getResourceName(); |
| 307 | - $conn = $dbm->acquire( $dbname ); |
|
| 307 | + $conn = $dbm->acquire($dbname); |
|
| 308 | 308 | |
| 309 | 309 | try |
| 310 | 310 | { |
| 311 | 311 | $id = $item->getId(); |
| 312 | - $date = date( 'Y-m-d H:i:s' ); |
|
| 312 | + $date = date('Y-m-d H:i:s'); |
|
| 313 | 313 | $billingAddress = $item->getPaymentAddress(); |
| 314 | 314 | |
| 315 | - if( $id === null ) |
|
| 315 | + if ($id === null) |
|
| 316 | 316 | { |
| 317 | 317 | /** mshop/customer/manager/laravel/insert |
| 318 | 318 | * Inserts a new customer record into the database table |
@@ -376,48 +376,48 @@ discard block |
||
| 376 | 376 | $path = 'mshop/customer/manager/laravel/update'; |
| 377 | 377 | } |
| 378 | 378 | |
| 379 | - $stmt = $this->getCachedStatement( $conn, $path ); |
|
| 380 | - |
|
| 381 | - $stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 382 | - $stmt->bind( 2, $item->getCode() ); |
|
| 383 | - $stmt->bind( 3, $billingAddress->getCompany() ); |
|
| 384 | - $stmt->bind( 4, $billingAddress->getVatID() ); |
|
| 385 | - $stmt->bind( 5, $billingAddress->getSalutation() ); |
|
| 386 | - $stmt->bind( 6, $billingAddress->getTitle() ); |
|
| 387 | - $stmt->bind( 7, $billingAddress->getFirstname() ); |
|
| 388 | - $stmt->bind( 8, $billingAddress->getLastname() ); |
|
| 389 | - $stmt->bind( 9, $billingAddress->getAddress1() ); |
|
| 390 | - $stmt->bind( 10, $billingAddress->getAddress2() ); |
|
| 391 | - $stmt->bind( 11, $billingAddress->getAddress3() ); |
|
| 392 | - $stmt->bind( 12, $billingAddress->getPostal() ); |
|
| 393 | - $stmt->bind( 13, $billingAddress->getCity() ); |
|
| 394 | - $stmt->bind( 14, $billingAddress->getState() ); |
|
| 395 | - $stmt->bind( 15, $billingAddress->getCountryId() ); |
|
| 396 | - $stmt->bind( 16, $billingAddress->getLanguageId() ); |
|
| 397 | - $stmt->bind( 17, $billingAddress->getTelephone() ); |
|
| 398 | - $stmt->bind( 18, $billingAddress->getTelefax() ); |
|
| 399 | - $stmt->bind( 19, $billingAddress->getWebsite() ); |
|
| 400 | - $stmt->bind( 20, $billingAddress->getEmail() ); |
|
| 401 | - $stmt->bind( 21, $billingAddress->getLongitude() ); |
|
| 402 | - $stmt->bind( 22, $billingAddress->getLatitude() ); |
|
| 403 | - $stmt->bind( 23, $item->getLabel() ); |
|
| 404 | - $stmt->bind( 24, $item->getBirthday() ); |
|
| 405 | - $stmt->bind( 25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 406 | - $stmt->bind( 26, $item->getDateVerified() ); |
|
| 407 | - $stmt->bind( 27, $item->getPassword() ); |
|
| 408 | - $stmt->bind( 28, $date ); // Modification time |
|
| 409 | - $stmt->bind( 29, $context->getEditor() ); |
|
| 410 | - |
|
| 411 | - if( $id !== null ) { |
|
| 412 | - $stmt->bind( 30, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
| 413 | - $item->setId( $id ); |
|
| 379 | + $stmt = $this->getCachedStatement($conn, $path); |
|
| 380 | + |
|
| 381 | + $stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 382 | + $stmt->bind(2, $item->getCode()); |
|
| 383 | + $stmt->bind(3, $billingAddress->getCompany()); |
|
| 384 | + $stmt->bind(4, $billingAddress->getVatID()); |
|
| 385 | + $stmt->bind(5, $billingAddress->getSalutation()); |
|
| 386 | + $stmt->bind(6, $billingAddress->getTitle()); |
|
| 387 | + $stmt->bind(7, $billingAddress->getFirstname()); |
|
| 388 | + $stmt->bind(8, $billingAddress->getLastname()); |
|
| 389 | + $stmt->bind(9, $billingAddress->getAddress1()); |
|
| 390 | + $stmt->bind(10, $billingAddress->getAddress2()); |
|
| 391 | + $stmt->bind(11, $billingAddress->getAddress3()); |
|
| 392 | + $stmt->bind(12, $billingAddress->getPostal()); |
|
| 393 | + $stmt->bind(13, $billingAddress->getCity()); |
|
| 394 | + $stmt->bind(14, $billingAddress->getState()); |
|
| 395 | + $stmt->bind(15, $billingAddress->getCountryId()); |
|
| 396 | + $stmt->bind(16, $billingAddress->getLanguageId()); |
|
| 397 | + $stmt->bind(17, $billingAddress->getTelephone()); |
|
| 398 | + $stmt->bind(18, $billingAddress->getTelefax()); |
|
| 399 | + $stmt->bind(19, $billingAddress->getWebsite()); |
|
| 400 | + $stmt->bind(20, $billingAddress->getEmail()); |
|
| 401 | + $stmt->bind(21, $billingAddress->getLongitude()); |
|
| 402 | + $stmt->bind(22, $billingAddress->getLatitude()); |
|
| 403 | + $stmt->bind(23, $item->getLabel()); |
|
| 404 | + $stmt->bind(24, $item->getBirthday()); |
|
| 405 | + $stmt->bind(25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 406 | + $stmt->bind(26, $item->getDateVerified()); |
|
| 407 | + $stmt->bind(27, $item->getPassword()); |
|
| 408 | + $stmt->bind(28, $date); // Modification time |
|
| 409 | + $stmt->bind(29, $context->getEditor()); |
|
| 410 | + |
|
| 411 | + if ($id !== null) { |
|
| 412 | + $stmt->bind(30, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
| 413 | + $item->setId($id); |
|
| 414 | 414 | } else { |
| 415 | - $stmt->bind( 30, $date ); // Creation time |
|
| 415 | + $stmt->bind(30, $date); // Creation time |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | $stmt->execute()->finish(); |
| 419 | 419 | |
| 420 | - if( $id === null && $fetch === true ) |
|
| 420 | + if ($id === null && $fetch === true) |
|
| 421 | 421 | { |
| 422 | 422 | /** mshop/customer/manager/laravel/newid |
| 423 | 423 | * Retrieves the ID generated by the database when inserting a new record |
@@ -450,14 +450,14 @@ discard block |
||
| 450 | 450 | * @see mshop/customer/manager/laravel/count |
| 451 | 451 | */ |
| 452 | 452 | $path = 'mshop/customer/manager/laravel/newid'; |
| 453 | - $item->setId( $this->newId( $conn, $path ) ); |
|
| 453 | + $item->setId($this->newId($conn, $path)); |
|
| 454 | 454 | } |
| 455 | 455 | |
| 456 | - $dbm->release( $conn, $dbname ); |
|
| 456 | + $dbm->release($conn, $dbname); |
|
| 457 | 457 | } |
| 458 | - catch( \Exception $e ) |
|
| 458 | + catch (\Exception $e) |
|
| 459 | 459 | { |
| 460 | - $dbm->release( $conn, $dbname ); |
|
| 460 | + $dbm->release($conn, $dbname); |
|
| 461 | 461 | throw $e; |
| 462 | 462 | } |
| 463 | 463 | } |
@@ -471,11 +471,11 @@ discard block |
||
| 471 | 471 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface |
| 472 | 472 | * @throws \Aimeos\MShop\Customer\Exception If creating items failed |
| 473 | 473 | */ |
| 474 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null ) |
|
| 474 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null) |
|
| 475 | 475 | { |
| 476 | 476 | $dbm = $this->getContext()->getDatabaseManager(); |
| 477 | 477 | $dbname = $this->getResourceName(); |
| 478 | - $conn = $dbm->acquire( $dbname ); |
|
| 478 | + $conn = $dbm->acquire($dbname); |
|
| 479 | 479 | $map = []; |
| 480 | 480 | |
| 481 | 481 | try |
@@ -483,27 +483,27 @@ discard block |
||
| 483 | 483 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
| 484 | 484 | $cfgPathSearch = 'mshop/customer/manager/laravel/search'; |
| 485 | 485 | $cfgPathCount = 'mshop/customer/manager/laravel/count'; |
| 486 | - $required = array( 'customer' ); |
|
| 486 | + $required = array('customer'); |
|
| 487 | 487 | |
| 488 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
|
| 489 | - while( ( $row = $results->fetch() ) !== false ) { |
|
| 490 | - $map[ $row['customer.id'] ] = $row; |
|
| 488 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); |
|
| 489 | + while (($row = $results->fetch()) !== false) { |
|
| 490 | + $map[$row['customer.id']] = $row; |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | - $dbm->release( $conn, $dbname ); |
|
| 493 | + $dbm->release($conn, $dbname); |
|
| 494 | 494 | } |
| 495 | - catch( \Exception $e ) |
|
| 495 | + catch (\Exception $e) |
|
| 496 | 496 | { |
| 497 | - $dbm->release( $conn, $dbname ); |
|
| 497 | + $dbm->release($conn, $dbname); |
|
| 498 | 498 | throw $e; |
| 499 | 499 | } |
| 500 | 500 | |
| 501 | 501 | $addrItems = []; |
| 502 | - if( in_array( 'address', $ref, true ) ) { |
|
| 503 | - $addrItems = $this->getAddressItems( array_keys( $map ) ); |
|
| 502 | + if (in_array('address', $ref, true)) { |
|
| 503 | + $addrItems = $this->getAddressItems(array_keys($map)); |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | - return $this->buildItems( $map, $ref, 'customer', $addrItems ); |
|
| 506 | + return $this->buildItems($map, $ref, 'customer', $addrItems); |
|
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | |
@@ -514,8 +514,8 @@ discard block |
||
| 514 | 514 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 515 | 515 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 516 | 516 | */ |
| 517 | - public function getSubManager( $manager, $name = null ) |
|
| 517 | + public function getSubManager($manager, $name = null) |
|
| 518 | 518 | { |
| 519 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
| 519 | + return $this->getSubManagerBase('customer', $manager, ($name === null ? 'Laravel' : $name)); |
|
| 520 | 520 | } |
| 521 | 521 | } |