Commit f0c2a67f authored by Stefan Busemann's avatar Stefan Busemann
Browse files

Merge branch '7-update-memberbadges' into 'master'

Resolve "Update memberbadges"

Closes #7

See merge request t3o/t3o_membership!2
parents de3441f8 526ebd83
......@@ -147,7 +147,6 @@ class Membership extends \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
$this->personalMembership = $personalMembership;
}
/**
* Returns true, if the membership is a personal membership
*
......@@ -165,7 +164,4 @@ class Membership extends \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
{
$this->sorting = $sorting;
}
}
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#B9B9B9;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{font-family:'Share-Regular';}
.st5{fill:none;}
.st6{font-family:'SourceSansPro-Light';}
.st7{font-size:15px;}
.st8{fill:#E9E9E9;}
.st9{fill:#505050;}
.st10{font-family:'SourceSansPro-It';}
</style>
<g>
<rect x="-0.4" y="0.2" class="st0" width="210" height="83.8"/>
<g>
<path class="st1" d="M54,51.2c-0.7,0.2-1.3,0.3-2,0.3c-6.1,0-15.1-21.4-15.1-28.5c0-2.6,0.6-3.5,1.5-4.2
c-7.5,0.9-16.5,3.6-19.4,7.1c-0.6,0.9-1,2.2-1,4c0,11.1,11.9,36.3,20.2,36.3C42.1,66.1,48.7,59.8,54,51.2L54,51.2z"/>
<path class="st1" d="M50.1,17.9c7.7,0,15.5,1.2,15.5,5.6c0,8.9-5.6,19.6-8.5,19.6c-5.1,0-11.5-14.2-11.5-21.4
C45.6,18.6,46.9,17.9,50.1,17.9z"/>
</g>
<rect x="89.3" y="9" class="st1" width="0.5" height="66"/>
<g>
<text transform="matrix(1 0 0 1 107.7654 28.831)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3</tspan><tspan x="41.3" y="0" class="st1 st4 st3"> </tspan></text>
<rect x="107.8" y="42.1" class="st5" width="91.8" height="27.5"/>
<text transform="matrix(1 0 0 1 107.7654 52.9255)"><tspan x="0" y="0" class="st1 st6 st7">Bronze</tspan><tspan x="0" y="16" class="st1 st6 st7">Member</tspan></text>
</g>
<rect x="-0.4" y="83.9" class="st8" width="210" height="21.3"/>
<rect x="107.8" y="88.3" class="st5" width="101.8" height="11.9"/>
<text transform="matrix(1 0 0 1 107.7654 99.0066)" class="st9 st10 st7">Academic</text>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#505050;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{font-family:'Share-Regular';}
.st5{fill:none;}
.st6{font-family:'SourceSansPro-Light';}
.st7{font-size:15px;}
.st8{fill:#E9E9E9;}
.st9{font-family:'SourceSansPro-It';}
</style>
<rect x="-0.4" y="0.2" class="st0" width="210" height="83.8"/>
<g>
<path class="st1" d="M54,51.2c-0.7,0.2-1.3,0.3-2,0.3c-6.1,0-15.1-21.4-15.1-28.5c0-2.6,0.6-3.5,1.5-4.2
c-7.5,0.9-16.5,3.6-19.4,7.1c-0.6,0.9-1,2.2-1,4c0,11.1,11.9,36.3,20.2,36.3C42.1,66.2,48.7,59.8,54,51.2L54,51.2z"/>
<path class="st1" d="M50.1,18c7.7,0,15.5,1.2,15.5,5.6c0,8.9-5.6,19.6-8.5,19.6c-5.1,0-11.5-14.2-11.5-21.4
C45.6,18.6,46.9,18,50.1,18z"/>
</g>
<rect x="89.3" y="9" class="st1" width="0.5" height="66"/>
<g>
<text transform="matrix(1 0 0 1 107.7654 28.8378)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3</tspan><tspan x="41.3" y="0" class="st1 st4 st3"> </tspan></text>
<rect x="107.8" y="42.1" class="st5" width="91.8" height="27.5"/>
<text transform="matrix(1 0 0 1 107.7654 52.9323)"><tspan x="0" y="0" class="st1 st6 st7">Gold</tspan><tspan x="0" y="16" class="st1 st6 st7">Member</tspan></text>
</g>
<rect x="-0.4" y="83.9" class="st8" width="210" height="21.3"/>
<rect x="107.8" y="88.3" class="st5" width="101.8" height="11.9"/>
<text transform="matrix(1 0 0 1 107.7654 99.0134)" class="st0 st9 st7">Academic</text>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#8C8C8C;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{font-family:'Share-Regular';}
.st5{fill:none;}
.st6{font-family:'SourceSansPro-Light';}
.st7{font-size:15px;}
.st8{fill:#E9E9E9;}
.st9{fill:#505050;}
.st10{font-family:'SourceSansPro-It';}
</style>
<rect x="-0.4" y="0.1" class="st0" width="210" height="83.8"/>
<g>
<path class="st1" d="M54,51.1c-0.7,0.2-1.3,0.3-2,0.3c-6.1,0-15.1-21.4-15.1-28.5c0-2.6,0.6-3.5,1.5-4.2
c-7.5,0.9-16.5,3.6-19.4,7.1c-0.6,0.9-1,2.2-1,4c0,11.1,11.9,36.3,20.2,36.3C42.1,66.1,48.7,59.7,54,51.1L54,51.1z"/>
<path class="st1" d="M50.1,17.9c7.7,0,15.5,1.2,15.5,5.6c0,8.9-5.6,19.6-8.5,19.6c-5.1,0-11.5-14.2-11.5-21.4
C45.6,18.5,46.9,17.9,50.1,17.9z"/>
</g>
<rect x="89.3" y="9" class="st1" width="0.5" height="66"/>
<text transform="matrix(1 0 0 1 107.7654 28.7587)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3</tspan><tspan x="41.3" y="0" class="st1 st4 st3"> </tspan></text>
<rect x="107.8" y="42.1" class="st5" width="91.8" height="27.5"/>
<text transform="matrix(1 0 0 1 107.7654 52.8532)"><tspan x="0" y="0" class="st1 st6 st7">Silver</tspan><tspan x="0" y="16" class="st1 st6 st7">Member</tspan></text>
<rect x="-0.4" y="83.9" class="st8" width="210" height="21.3"/>
<rect x="107.8" y="88.3" class="st5" width="101.8" height="11.9"/>
<text transform="matrix(1 0 0 1 107.7654 98.9343)" class="st9 st10 st7">Academic</text>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#B9B9B9;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{fill:none;}
.st5{font-family:'SourceSansPro-Light';}
.st6{font-size:15px;}
</style>
<rect x="-0.5" y="-0.1" class="st0" width="210" height="105"/>
<g>
<path class="st1" d="M58.9,62.8c-0.8,0.2-1.5,0.3-2.3,0.3c-7,0-17.2-24.3-17.2-32.4c0-3,0.7-4,1.7-4.8c-8.5,1-18.7,4.1-22,8.1
c-0.7,1-1.1,2.6-1.1,4.5c0,12.6,13.5,41.3,23,41.3C45.3,79.8,52.8,72.6,58.9,62.8L58.9,62.8z"/>
<path class="st1" d="M54.4,25c8.8,0,17.6,1.4,17.6,6.4c0,10.1-6.4,22.3-9.6,22.3c-5.8,0-13-16.2-13-24.3C49.3,25.7,50.7,25,54.4,25
z"/>
</g>
<rect x="89.3" y="9" class="st1" width="0.5" height="87.5"/>
<text transform="matrix(1 0 0 1 107.6885 39.7452)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3 </tspan></text>
<rect x="107.7" y="53.1" class="st4" width="91.8" height="30.6"/>
<text transform="matrix(1 0 0 1 107.6885 63.8397)"><tspan x="0" y="0" class="st1 st5 st6">Bronze</tspan><tspan x="0" y="16" class="st1 st5 st6">Member</tspan></text>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E9E9E9;}
.st1{fill:#8C8C8C;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{fill:none;}
.st5{font-family:'SourceSansPro-Light';}
.st6{font-size:15px;}
</style>
<rect class="st0" width="210" height="105"/>
<g>
<path class="st1" d="M59.3,62.9c-0.8,0.2-1.5,0.3-2.3,0.3c-7,0-17.2-24.3-17.2-32.4c0-3,0.7-4,1.7-4.8c-8.5,1-18.7,4.1-22,8.1
c-0.7,1-1.1,2.6-1.1,4.5c0,12.6,13.5,41.3,23,41.3C45.8,79.9,53.3,72.7,59.3,62.9L59.3,62.9z"/>
<path class="st1" d="M54.9,25.1c8.8,0,17.6,1.4,17.6,6.4c0,10.1-6.4,22.3-9.6,22.3c-5.8,0-13-16.2-13-24.3
C49.8,25.8,51.2,25.1,54.9,25.1z"/>
</g>
<rect x="89.8" y="9.1" class="st1" width="0.5" height="87.5"/>
<text transform="matrix(1 0 0 1 108.1879 39.8466)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3 </tspan></text>
<rect x="108.2" y="53.2" class="st4" width="91.8" height="30.6"/>
<text transform="matrix(1 0 0 1 108.1879 63.9412)"><tspan x="0" y="0" class="st1 st5 st6">Community</tspan><tspan x="0" y="16" class="st1 st5 st6">Member</tspan></text>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#505050;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{fill:none;}
.st5{font-family:'SourceSansPro-Light';}
.st6{font-size:15px;}
</style>
<g>
<rect x="-0.5" y="-0.5" class="st0" width="210" height="105"/>
<g>
<path class="st1" d="M58.9,62.4c-0.8,0.2-1.5,0.3-2.3,0.3c-7,0-17.2-24.3-17.2-32.4c0-3,0.7-4,1.7-4.8c-8.5,1-18.7,4.1-22,8.1
c-0.7,1-1.1,2.6-1.1,4.5c0,12.6,13.5,41.3,23,41.3C45.3,79.4,52.8,72.1,58.9,62.4L58.9,62.4z"/>
<path class="st1" d="M54.4,24.6C63.2,24.6,72,26,72,31c0,10.1-6.4,22.3-9.6,22.3c-5.8,0-13-16.2-13-24.3
C49.3,25.3,50.7,24.6,54.4,24.6z"/>
</g>
<rect x="89.3" y="8.6" class="st1" width="0.5" height="87.5"/>
<text transform="matrix(1 0 0 1 107.6885 39.335)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3 </tspan></text>
<rect x="107.7" y="52.6" class="st4" width="91.8" height="30.6"/>
<text transform="matrix(1 0 0 1 107.6885 63.4295)"><tspan x="0" y="0" class="st1 st5 st6">Gold</tspan><tspan x="0" y="16" class="st1 st5 st6">Member</tspan></text>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FF9800;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{font-family:'Share-Regular';}
.st5{fill:none;}
.st6{font-family:'SourceSansPro-Light';}
.st7{font-size:15px;}
</style>
<g>
<rect x="-0.5" y="0.2" class="st0" width="210" height="105"/>
<g>
<path class="st1" d="M58.9,63.4c-0.8,0.2-1.5,0.3-2.3,0.3c-7,0-17.2-24.3-17.2-32.4c0-3,0.7-4,1.7-4.8c-8.5,1-18.7,4.1-22,8.1
c-0.7,1-1.1,2.6-1.1,4.5c0,12.6,13.5,41.3,23,41.3C45.3,80.4,52.8,73.2,58.9,63.4L58.9,63.4z"/>
<path class="st1" d="M54.4,25.7c8.8,0,17.6,1.4,17.6,6.4c0,10.1-6.4,22.3-9.6,22.3c-5.8,0-13-16.2-13-24.3
C49.3,26.4,50.7,25.7,54.4,25.7z"/>
</g>
<rect x="89.3" y="9.6" class="st1" width="0.5" height="87.5"/>
<text transform="matrix(1 0 0 1 107.6885 39.3614)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3</tspan><tspan x="41.3" y="0" class="st1 st4 st3"> </tspan></text>
<rect x="107.7" y="52.7" class="st5" width="91.8" height="29.8"/>
<text transform="matrix(1 0 0 1 107.6885 63.456)"><tspan x="0" y="0" class="st1 st6 st7">Platinum</tspan><tspan x="0" y="16" class="st1 st6 st7">Member</tspan></text>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 210 105" style="enable-background:new 0 0 210 105;" xml:space="preserve">
<style type="text/css">
.st0{fill:#8C8C8C;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Share-Bold';}
.st3{font-size:16.8001px;}
.st4{fill:none;}
.st5{font-family:'SourceSansPro-Light';}
.st6{font-size:15px;}
</style>
<g>
<rect x="-0.5" y="0.1" class="st0" width="210" height="105"/>
<g>
<path class="st1" d="M58.9,63c-0.8,0.2-1.5,0.3-2.3,0.3c-7,0-17.2-24.3-17.2-32.4c0-3,0.7-4,1.7-4.8c-8.5,1-18.7,4.1-22,8.1
c-0.7,1-1.1,2.6-1.1,4.5C18,51.4,31.4,80,40.9,80C45.3,80,52.8,72.8,58.9,63L58.9,63z"/>
<path class="st1" d="M54.4,25.3c8.8,0,17.6,1.4,17.6,6.4c0,10.1-6.4,22.3-9.6,22.3c-5.8,0-13-16.2-13-24.3
C49.3,26,50.7,25.3,54.4,25.3z"/>
</g>
<rect x="89.3" y="9.2" class="st1" width="0.5" height="87.5"/>
<text transform="matrix(1 0 0 1 107.6885 39.9649)"><tspan x="0" y="0" class="st1 st2 st3">T</tspan><tspan x="7.5" y="0" class="st1 st2 st3">Y</tspan><tspan x="16.2" y="0" class="st1 st2 st3">P</tspan><tspan x="24.7" y="0" class="st1 st2 st3">O</tspan><tspan x="33.4" y="0" class="st1 st2 st3">3 </tspan></text>
<rect x="107.7" y="53.3" class="st4" width="91.8" height="30.6"/>
<text transform="matrix(1 0 0 1 107.6885 64.0594)"><tspan x="0" y="0" class="st1 st5 st6">Silver</tspan><tspan x="0" y="16" class="st1 st5 st6">Member</tspan></text>
</g>
</svg>
......@@ -50,9 +50,20 @@ CREATE TABLE tx_t3omembership_domain_model_membership (
pid int(11) DEFAULT '0' NOT NULL,
name varchar(255) DEFAULT '' NOT NULL,
subheader varchar(255) DEFAULT '' NOT NULL,
description text, NOT Null,
logo text NOT NULL,
personal_membership tinyint(4) DEFAULT '0' NOT NULL,
academic_membership tinyint(4) DEFAULT '0' NOT NULL,
no_filter tinyint(4) DEFAULT '0' NOT NULL,
event_vouchers_number int(11) unsigned DEFAULT '0' NOT NULL,
event_voucher_value double(11,2) DEFAULT '0.00' NOT NULL,
event_vouchers_number_academic int(11) unsigned DEFAULT '0' NOT NULL,
certification_discount_number int(11) unsigned DEFAULT '0' NOT NULL,
registration_fee double(11,2) DEFAULT '0.00' NOT NULL,
annual_fee double(11,2) DEFAULT '0.00' NOT NULL,
shop_link varchar(255) DEFAULT '' NOT NULL,
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
crdate int(11) unsigned DEFAULT '0' NOT NULL,
......@@ -72,5 +83,4 @@ CREATE TABLE tx_t3omembership_domain_model_membership (
KEY parent (pid),
KEY language (l10n_parent,sys_language_uid)
);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment