Changeset 1800775
- Timestamp:
- 01/10/2018 07:59:15 PM (8 years ago)
- Location:
- eewee-sellsy/trunk
- Files:
-
- 5 edited
-
composer.json (modified) (2 diffs)
-
forms/FContactFormEdit.php (modified) (1 diff)
-
index.php (modified) (1 diff)
-
models/TSellsyCustomFields.php (modified) (1 diff)
-
phpunit.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
eewee-sellsy/trunk/composer.json
r1798231 r1800775 2 2 "name": "michael/phpunit", 3 3 "require-dev": { 4 "phpunit/phpunit": "^6.5", 5 "phpunit/dbunit": "^3.0" 4 "phpunit/phpunit": "^6.5.2" 6 5 }, 7 6 "authors": [ … … 11 10 } 12 11 ], 13 "require": {}, 12 "require": { 13 "phpunit/php-code-coverage": "5.2.3" 14 }, 14 15 "autoload-dev": { 15 16 "psr-4": { -
eewee-sellsy/trunk/forms/FContactFormEdit.php
r1792771 r1800775 584 584 } 585 585 586 $requiredCF = $t_customFields->countTotalRequiredField(array( 587 "response" => $responseCustomFields, 588 "cfByName" => true, 589 )); 590 if (sizeof($requiredCF)>1) { 591 echo _e('Required fields', PLUGIN_NOM_LANG); 592 } else { 593 echo _e('Required field', PLUGIN_NOM_LANG); 594 } 595 echo " : <br><ul><li>".implode("</li><li>", $requiredCF)."</li></ul>"; 596 586 597 } 587 598 ?> -
eewee-sellsy/trunk/index.php
r1799247 r1800775 154 154 $dbUpdate = new helpers\DbUpdate(); 155 155 $dbVersion = $dbUpdate->getVersion(); 156 if (EEWEE_VERSION > $dbVersion && $dbVersion !== false) { $dbUpdate->updateDb($dbVersion); }156 if (EEWEE_VERSION > $dbVersion && $dbVersion !== false) { $dbUpdate->updateDb($dbVersion); die("coucou"); } 157 157 } 158 158 -
eewee-sellsy/trunk/models/TSellsyCustomFields.php
r1798261 r1800775 99 99 } 100 100 101 /** 102 * Return nb required CF field by default. 103 * Return array with name required CF field, if $d['cfByName']=true. 104 * 105 * @param $d 106 * 107 * @return bool false nothing required CF field|int nb required CF field|array name required CF field 108 */ 109 public function countTotalRequiredField($d) 110 { 111 $resultsCustomFields = $d['response']; 112 $res = ""; 113 $iRequired = 0; 114 115 if (isset($resultsCustomFields) && !empty($resultsCustomFields)) { 116 foreach ( $resultsCustomFields->response->result as $resultCustomFields ) { 117 if ( $resultCustomFields->status == 'ok' && $resultCustomFields->isRequired == 'Y' ) { 118 if ($d['cfByName'] === true) { 119 $res[] = $resultCustomFields->name; 120 } else { 121 $res = $iRequired++; 122 } 123 } 124 } 125 return $res; 126 } 127 return false; 128 } 129 101 130 } 102 131 } -
eewee-sellsy/trunk/phpunit.xml
r1798257 r1800775 14 14 <filter> 15 15 <whitelist processUncoveredFilesFromWhitelist="true"> 16 <directory suffix=".php">src</directory> 17 <exclude> 18 <file suffix=".php">./tests/MathTest.php</file> 19 </exclude> 16 <directory suffix=".php">./controllers</directory> 20 17 </whitelist> 21 18 </filter>
Note: See TracChangeset
for help on using the changeset viewer.