Merge pull request #15679 from eileenmcnaughton/script_fee

dev/event#19 remove obsolete scriptFee & scriptArray
civicrm · Nov 1, 2019 · 40143ea · 40143ea
2 parents 677e677 + 4d9851f
commit 40143ea
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -174,9 +174,6 @@ public function buildQuickForm() {
 
     $button = substr($this->controller->getButtonName(), -4);
 
-    $this->add('hidden', 'scriptFee', NULL);
-    $this->add('hidden', 'scriptArray', NULL);
-
     if ($this->_values['event']['is_monetary']) {
       CRM_Event_Form_Registration_Register::buildAmount($this);
     }

diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php
@@ -343,9 +343,6 @@ public function buildQuickForm() {
       $this->assign('display_name', CRM_Contact_BAO_Contact::displayName($contactID));
     }
 
-    $this->add('hidden', 'scriptFee', NULL);
-    $this->add('hidden', 'scriptArray', NULL);
-
     $bypassPayment = $allowGroupOnWaitlist = $isAdditionalParticipants = FALSE;
     if ($this->_values['event']['is_multiple_registrations']) {
       // don't allow to add additional during confirmation if not preregistered.

diff --git a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
@@ -50,8 +50,6 @@ public function testSubmit() {
           'billing_state_province_id-5' => '1061',
           'billing_postal_code-5' => '7',
           'billing_country_id-5' => '1228',
-          'scriptFee' => '',
-          'scriptArray' => '',
           'priceSetId' => '6',
           'price_7' => [
             13 => 1,
@@ -264,8 +262,6 @@ public function testTaxMultipleParticipant() {
           'first_name' => 'Participant2',
           'last_name' => 'LastName',
           'email-Primary' => 'participant2@example.com',
-          'scriptFee' => '',
-          'scriptArray' => '',
           'campaign_id' => NULL,
           'is_pay_later' => 1,
           'participant_role_id' => '1',
@@ -280,8 +276,6 @@ public function testTaxMultipleParticipant() {
           'first_name' => 'Participant3',
           'last_name' => 'LastName',
           'email-Primary' => 'participant3@example.com',
-          'scriptFee' => '',
-          'scriptArray' => '',
           'campaign_id' => NULL,
           'is_pay_later' => 1,
           'participant_role_id' => '1',
@@ -376,8 +370,6 @@ public function testOnlineRegNoPrice() {
           'ip_address' => '127.0.0.1',
           'invoiceID' => '57adc34957a29171948e8643ce906332',
           'button' => '_qf_Register_upload',
-          'scriptFee' => '',
-          'scriptArray' => '',
         ],
       ],
     ]);
@@ -457,8 +449,6 @@ private function submitWithNote($event, $contact_id) {
           'billing_state_province_id-5' => '1061',
           'billing_postal_code-5' => '7',
           'billing_country_id-5' => '1228',
-          'scriptFee' => '',
-          'scriptArray' => '',
           'priceSetId' => '6',
           'price_7' => [
             13 => 1,