Package creating #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
April 14, 2023 13:42
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
composer.lockDev Package changes
Settings · Docs · Powered by Private Packagist |
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 14, 2023
codepuncher
reviewed
Apr 19, 2023
codepuncher
reviewed
Apr 19, 2023
codepuncher
previously approved these changes
Apr 19, 2023
Comment on lines
+49
to
+85
| public function get_field_input($form, $value = '', $entry = null): string | ||
| { | ||
| $id = (int) $this->id; | ||
| $giftaidImage = ITINERIS_GF_GIFT_AID_FIELD_URI . '/assets/giftaid.svg'; | ||
|
|
||
| ob_start(); | ||
| ?> | ||
| <div class="gift-box-wrapper bg-gray-50 rounded-br-4 p-7.5"> | ||
| <div class="gift-aid-logo mb-2"> | ||
| <img src="<?php echo esc_url($giftaidImage); ?>" alt="GiftAid logo"> | ||
| </div> | ||
| <div class="description text-primary font-medium text-xl mb-2"> | ||
| <?php //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | ||
| <?php echo wpautop(wp_kses_post($this->get_calculated_gift())); ?> | ||
| </div> | ||
| <div class="gift-box-form-wrapper my-6 pb-6 border-b border-b-gray-200"> | ||
| <div class="ginput_container ginput_container_checkbox mb-6"> | ||
| <div class="gfield_checkbox" id="input_<?php echo esc_attr($id); ?>"> | ||
| <div class="gchoice gchoice_<?php echo esc_attr($id); ?>"> | ||
| <input | ||
| class="gfield-choice-input" | ||
| id="gift-check-<?php echo esc_attr($id); ?>" | ||
| name="gift-check-<?php echo esc_attr($id); ?>" | ||
| type="checkbox" | ||
| value="1" | ||
| > | ||
| <label for="gift-check-<?php echo esc_attr($id); ?>"> | ||
| <?php echo esc_html($this->label); ?> | ||
| </label> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="details-description"><?php echo esc_html($this->description); ?></div> | ||
| </div> | ||
| <?php | ||
| return ob_get_clean(); |
There was a problem hiding this comment.
exists a way to not mix PHP and HTML ? I suggest to export this is another file
There was a problem hiding this comment.
I think that will be fine for next version/release. Now should be fine.
There was a problem hiding this comment.
If we don't do that from the start then we will do never. Trust me, I know.
src/GiftAidField.php
Outdated
|
|
||
| public function get_calculated_gift(): string | ||
| { | ||
| $calculationText = 'With Gift Aid, your donation of {{ donation }} would be worth {{ calculated_gift_aid }} |
There was a problem hiding this comment.
Suggested change
| $calculationText = 'With Gift Aid, your donation of {{ donation }} would be worth {{ calculated_gift_aid }} | |
| $calculationText = 'With Gift Aid, your donation of {{ donation }} would be worth {{ calculated_gift_aid }} |
Client should be able to edit this text from admin panel
| $totalAmt = $donation + $amount; | ||
| $displayNum = number_format((float) $totalAmt, 2, '.', ''); | ||
| $searchReplace = [ | ||
| '{{ donation }}' => "<span class=\"gform_donation_total\">£{$donation}</span>", |
There was a problem hiding this comment.
not sure if its okay to hardcode the currency £
|
The composer.lock diff comment has been updated to reflect new changes in this PR. |
|
The composer.lock diff comment has been updated to reflect new changes in this PR. |
codepuncher
approved these changes
Apr 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.