File tree Expand file tree Collapse file tree 3 files changed +16
-4
lines changed
Expand file tree Collapse file tree 3 files changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -17,6 +17,11 @@ protected function createAddressFields($address = NULL) {
1717 if ($ address == NULL ) $ address = new Address ();
1818 $ id = $ this ->getId ();
1919
20+ $ elem = new TextInput ($ this , $ id .'_name ' , $ address ->street1 );
21+ $ elem ->setPlaceholder ('address_name_label ' );
22+ $ elem ->addClass ('mb-1 ' );
23+ $ elem ->setRequired (TRUE );
24+
2025 $ elem = new TextInput ($ this , $ id .'_street1 ' , $ address ->street1 );
2126 $ elem ->setPlaceholder ('address_street1_label ' );
2227 $ elem ->addClass ('mb-1 ' );
@@ -46,6 +51,7 @@ public static function fromRequest($id, $request = NULL) {
4651 $ rc = NULL ;
4752 if ($ request ->hasPostParam ($ id .'_street1 ' )) {
4853 $ rc = new Address ();
54+ $ rc ->name = $ request ->getParam ($ id .'_name ' );
4955 $ rc ->street1 = $ request ->getParam ($ id .'_street1 ' );
5056 $ rc ->street2 = $ request ->getParam ($ id .'_street2 ' );
5157 $ rc ->zipCode = $ request ->getParam ($ id .'_zipCode ' );
Original file line number Diff line number Diff line change @@ -18,12 +18,14 @@ class Address {
1818 public function __construct () {
1919 }
2020
21- public function isComplete () {
22- return self ::isAddressComplete ($ this );
21+ public function isComplete ($ includeName = FALSE ) {
22+ return self ::isAddressComplete ($ this , $ includeName );
2323 }
2424
25- public static function isAddressComplete ($ address ) {
26- return !Utils::isEmpty ($ address ->street1 ) && !Utils::isEmpty ($ address ->zipCode ) && !Utils::isEmpty ($ address ->city ) && !Utils::isEmpty ($ address ->country );
25+ public static function isAddressComplete ($ address , $ includeName = FALSE ) {
26+ $ rc = !Utils::isEmpty ($ address ->street1 ) && !Utils::isEmpty ($ address ->zipCode ) && !Utils::isEmpty ($ address ->city ) && !Utils::isEmpty ($ address ->country );
27+ if ($ rc && $ includeName ) $ rc = !Utils::isEmpty ($ address ->name );
28+ return $ rc ;
2729 }
2830
2931 public static function toSingleLine ($ address , $ language = NULL ) {
Original file line number Diff line number Diff line change 458458 'en ' => 'Languages ' ,
459459 ),
460460 // General address and delivery labels
461+ 'address_name_label ' => array (
462+ 'de ' => 'Vor- und Nachname ' ,
463+ 'en ' => 'Full Name ' ,
464+ ),
461465 'address_street1_label ' => array (
462466 'de ' => 'Straße und Hausnummer ' ,
463467 'en ' => 'Address ' ,
You can’t perform that action at this time.
0 commit comments