Merge pull request #175 from phili67/phili67-pledgeeditor-change

Phili67 pledgeeditor change
phili67 · Jan 31, 2018 · db323ec · db323ec
2 parents 4ecfa6d + 74f76c1
commit db323ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/FamilyView.php b/src/FamilyView.php
@@ -750,7 +750,7 @@ class="fa fa-trash"></i></button>
                                                 <?= $payType ?>&nbsp;
                                             </td>
                                             <td>
-                                                <?= $aut_NextPayDate ?>&nbsp;
+                                                <?= OutputUtils::change_date_for_place_holder($aut_NextPayDate) ?>&nbsp;
                                             </td>
                                             <td>
                                                 <?= $aut_Amount ?>&nbsp;
@@ -770,7 +770,7 @@ class="fa fa-trash"></i></button>
                                                         href="AutoPaymentDelete.php?AutID=<?= $aut_ID ?>&amp;linkBack=FamilyView.php?FamilyID=<?= $iFamilyID ?>"><?= gettext("Delete") ?></a>
                                             </td>
                                             <td>
-                                                <?= $aut_DateLastEdited ?>&nbsp;
+                                                <?= OutputUtils::FormatDate($aut_DateLastEdited,1) ?>&nbsp;
                                             </td>
                                             <td>
                                                 <?= $EnteredFirstName . " " . $EnteredLastName ?>&nbsp;

diff --git a/src/PledgeEditor.php b/src/PledgeEditor.php
@@ -17,6 +17,7 @@
 use EcclesiaCRM\MICRReader;
 use EcclesiaCRM\Utils\InputUtils;
 use EcclesiaCRM\dto\SystemURLs;
+use EcclesiaCRM\Utils\OutputUtils;
 
 if (SystemConfig::getValue('bUseScannedChecks')) { // Instantiate the MICR class
     $micrObj = new MICRReader();
@@ -104,7 +105,7 @@
     isset($_POST['SetFundTypeSelection'])) {
     $iFamily = InputUtils::LegacyFilterInput($_POST['FamilyID'], 'int');
 
-    $dDate = InputUtils::LegacyFilterInput($_POST['Date']);
+    $dDate = InputUtils::FilterDate($_POST['Date']);
     if (!$dDate) {
         if (array_key_exists('idefaultDate', $_SESSION)) {
             $dDate = $_SESSION['idefaultDate'];
@@ -515,7 +516,7 @@
     $dDate = $dep_Date;
 } ?>
           <label for="Date"><?= gettext('Date') ?></label>
-          <input class="form-control" data-provide="datepicker" data-date-format='yyyy-mm-dd' type="text" name="Date" value="<?= $dDate ?>" ><font color="red"><?= $sDateError ?></font>
+          <input class="form-control" data-provide="datepicker" data-date-format='<?= SystemConfig::getValue("sDatePickerPlaceHolder") ?>' type="text" name="Date" value="<?= OutputUtils::change_date_for_place_holder($dDate) ?>" ><font color="red"><?= $sDateError ?></font>
           <label for="FYID"><?= gettext('Fiscal Year') ?></label>
            <?php PrintFYIDSelect($iFYID, 'FYID') ?>