diff --git a/democracy/page/default_donate/default_donate.php b/democracy/page/default_donate/default_donate.php index a44c397..40611b1 100644 --- a/democracy/page/default_donate/default_donate.php +++ b/democracy/page/default_donate/default_donate.php @@ -14,7 +14,9 @@ class default_donate implements SYSTEM\PAGE\Page { /*$vars['donation_paten'] = 9; $vars['donation_value'] = 61; $vars['donation_date'] = '14.05.2018 * 18:45 Uhr';*/ - $vars['donation_percentage'] = round($vars['donation_value']/100,0); + $vars['donation_percentage'] = round($vars['donation_value']/$vars['donation_value_goal']*100,0); + $vars['donation_paten_goal'] = number_format($vars['donation_paten_goal'] , 0, ',', '.'); + $vars['donation_value_goal'] = number_format($vars['donation_value_goal'] , 0, ',', '.'); return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_donate/tpl/donate_box.tpl'))->SERVERPATH(), $vars); } public function html(){ diff --git a/democracy/page/default_donate/tpl/donate_box.tpl b/democracy/page/default_donate/tpl/donate_box.tpl index c6fe855..e7d42e2 100644 --- a/democracy/page/default_donate/tpl/donate_box.tpl +++ b/democracy/page/default_donate/tpl/donate_box.tpl @@ -58,12 +58,12 @@
- ${donation_paten} VON 2.000 + ${donation_paten} VON ${donation_paten_goal} PATENSCHAFTEN ERREICHT!
- ${donation_value}€ von 10.000€ + ${donation_value}€ von ${donation_value_goal}€ (min. Finanzierungsziel/Monat) Stand: ${donation_date} diff --git a/democracy/sai/saimod_donate/js/saimod_donate.js b/democracy/sai/saimod_donate/js/saimod_donate.js index 03abcaa..e3c710b 100644 --- a/democracy/sai/saimod_donate/js/saimod_donate.js +++ b/democracy/sai/saimod_donate/js/saimod_donate.js @@ -1,7 +1,9 @@ function init_saimod_donate() { $('#donate-update').click(function(){ - var paten = $('#donate-paten').val(); - var value = $('#donate-value').val(); + var paten = $('#donate-paten').val(); + var value = $('#donate-value').val(); + var paten_goal = $('#donate-paten-goal').val(); + var value_goal = $('#donate-value-goal').val(); $.ajax({ async: true, url: this.endpoint, @@ -11,7 +13,9 @@ function init_saimod_donate() { sai_mod: '.SAI.saimod_donate', action: 'update', paten: paten, - value: value + value: value, + paten_goal: paten_goal, + value_goal: value_goal }, success: function(data){ if(data.status){ diff --git a/democracy/sai/saimod_donate/saimod_donate.php b/democracy/sai/saimod_donate/saimod_donate.php index 84666e1..85ee52d 100644 --- a/democracy/sai/saimod_donate/saimod_donate.php +++ b/democracy/sai/saimod_donate/saimod_donate.php @@ -7,9 +7,11 @@ class saimod_donate extends \SYSTEM\SAI\sai_module{ return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_donate/tpl/saimod_donate.tpl'))->SERVERPATH(),$vars);} - public static function sai_mod__SAI_saimod_donate_action_update($paten,$value){ + public static function sai_mod__SAI_saimod_donate_action_update($paten,$value,$paten_goal,$value_goal){ \SYSTEM\PAGE\text::save('donation_paten', 'donation_paten', 'deDE', ['donation'], $paten); \SYSTEM\PAGE\text::save('donation_value', 'donation_value', 'deDE', ['donation'], $value); + \SYSTEM\PAGE\text::save('donation_paten_goal', 'donation_paten_goal', 'deDE', ['donation'], $paten_goal); + \SYSTEM\PAGE\text::save('donation_value_goal', 'donation_value_goal', 'deDE', ['donation'], $value_goal); \SYSTEM\PAGE\text::save('donation_date', 'donation_date', 'deDE', ['donation'], date('d.m.Y * H:i').' Uhr'); return \SYSTEM\LOG\JsonResult::ok(); } diff --git a/democracy/sai/saimod_donate/sql/mysql/system_api.sql b/democracy/sai/saimod_donate/sql/mysql/system_api.sql index 352a2df..4052610 100644 --- a/democracy/sai/saimod_donate/sql/mysql/system_api.sql +++ b/democracy/sai/saimod_donate/sql/mysql/system_api.sql @@ -1,3 +1,5 @@ REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (8000, 42, 0, 0, '_SAI_saimod_donate', 'action', NULL); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (8010, 42, 2, 8000, 'update', 'paten', 'STRING'); -REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (8011, 42, 2, 8000, 'update', 'value', 'STRING'); \ No newline at end of file +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (8011, 42, 2, 8000, 'update', 'value', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (8012, 42, 2, 8000, 'update', 'paten_goal', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (8013, 42, 2, 8000, 'update', 'value_goal', 'STRING'); \ No newline at end of file diff --git a/democracy/sai/saimod_donate/tpl/saimod_donate.tpl b/democracy/sai/saimod_donate/tpl/saimod_donate.tpl index b77121f..f86e77a 100644 --- a/democracy/sai/saimod_donate/tpl/saimod_donate.tpl +++ b/democracy/sai/saimod_donate/tpl/saimod_donate.tpl @@ -12,10 +12,18 @@ Value + + Paten Goal + + + + Value Goal + + - + diff --git a/democracy/sql/mysql/system_text.sql b/democracy/sql/mysql/system_text.sql index 30c81e7..c93efeb 100644 --- a/democracy/sql/mysql/system_text.sql +++ b/democracy/sql/mysql/system_text.sql @@ -181,5 +181,9 @@ INSERT IGNORE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, INSERT IGNORE INTO `system_text_tag` (`id`, `tag`) VALUES ('donation_paten', 'donation'); INSERT IGNORE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('donation_value', 'deDE', '61', '1', '1', '2017-12-28 16:42:29', '2017-12-28 16:42:29'); INSERT IGNORE INTO `system_text_tag` (`id`, `tag`) VALUES ('donation_value', 'donation'); +INSERT IGNORE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('donation_paten_goal', 'deDE', '2000', '1', '1', '2017-12-28 16:42:29', '2017-12-28 16:42:29'); +INSERT IGNORE INTO `system_text_tag` (`id`, `tag`) VALUES ('donation_paten_goal', 'donation'); +INSERT IGNORE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('donation_value_goal', 'deDE', '10000', '1', '1', '2017-12-28 16:42:29', '2017-12-28 16:42:29'); +INSERT IGNORE INTO `system_text_tag` (`id`, `tag`) VALUES ('donation_value_goal', 'donation'); INSERT IGNORE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('donation_date', 'deDE', '14.05.2018 * 18:45 Uhr', '1', '1', '2017-12-28 16:42:29', '2017-12-28 16:42:29'); INSERT IGNORE INTO `system_text_tag` (`id`, `tag`) VALUES ('donation_date', 'donation'); \ No newline at end of file