Skip to content

Commit 0a35da5

Browse files
cp-scriptcp-script
committed
update from today
1 parent d4b4ac7 commit 0a35da5

File tree

6 files changed

+105
-4
lines changed

6 files changed

+105
-4
lines changed

‎app/config/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,4 @@ k_phoen_sms_sender:
141141
api_key: 6996a14b
142142
api_secret: 56751ffa
143143

144+

‎app/config/parameters.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ parameters:
1414
locale: en
1515
secret: ThisTokenIsNotSoSecretChangeIt
1616
supported_locale: [en, fr, es]
17+
18+
nexmo_from_name: MyCompany

‎src/COC/AdminBundle/Controller/ClanAdminController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function sendSMS($user,$msg,$clan )
5252

5353

5454
$sms_sender = $this->get('sms.sender');
55-
$sms_sender->send('0782231874', 'OYOOOO', 'Kévin');
55+
$sms_sender->send('0782231874', $msg, 'Kévin');
5656

5757

5858
return true;

‎src/COC/COCBundle/Command/PlayerCommand.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
3636
$players = $em->getRepository('COCBundle:Player')->findAll();
3737

3838

39-
$actualSeason = $em->getRepository('COCBundle:Season')->find(5);
39+
$actualSeason = $em->getRepository('COCBundle:Season')->find(6);
4040

4141

4242
foreach ($players as $player)
@@ -119,6 +119,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
119119
$playerHistory->setGold6($player->getGold6());
120120
$playerHistory->setGold7($player->getGold7());
121121

122+
$playerHistory->setDarkElixir1($player->getDarkElixir1());
123+
$playerHistory->setDarkElixir2($player->getDarkElixir2());
124+
$playerHistory->setDarkElixir3($player->getDarkElixir3());
125+
126+
127+
128+
122129
$playerHistory->setBarbar($player->getBarbar());
123130
$playerHistory->setArcher($player->getArcher());
124131
$playerHistory->setWallBreaker($player->getWallBreaker());

‎src/COC/COCBundle/Controller/PlayerController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ public function playerAction (Request $request, $id_clan, $id_player)
396396
'formBase' => $formBase->createView(),
397397
'myGold' => $this->perDay($this->getMyGoldPerHour($player)),
398398
'myElixir' => $this->perDay($this->getMyElixirPerHour($player)),
399-
'myDarkElixir' => $this->$this->getMyDarkElixirPerHour($player)* 24,
400-
'maxDarkElixir' => $this->$this->getMaxDarkElixirPerHour($player) * 24,
399+
'myDarkElixir' => $this->getMyDarkElixirPerHour($player)* 24,
400+
'maxDarkElixir' => $this->getMaxDarkElixirPerHour($player) * 24,
401401
'maxElixirGold' => $this->perDay($this->getMaxGoldElixirPerHour($player)),
402402
'players' => $players
403403
));

‎src/COC/COCBundle/Entity/PlayerHistory.php

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,28 @@ class PlayerHistory
5555
private $updatedAt;
5656

5757

58+
/**
59+
* @var integer
60+
*
61+
* @ORM\Column(name="darkElixir1", type="integer", nullable=true)
62+
*/
63+
private $darkElixir1;
64+
65+
/**
66+
* @var integer
67+
*
68+
* @ORM\Column(name="darkElixir2", type="integer", nullable=true)
69+
*/
70+
private $darkElixir2;
71+
72+
/**
73+
* @var integer
74+
*
75+
* @ORM\Column(name="darkElixir3", type="integer", nullable=true)
76+
*/
77+
private $darkElixir3;
78+
79+
5880
/**
5981
* @var integer
6082
*
@@ -2638,4 +2660,73 @@ public function getTotalDefence()
26382660
{
26392661
return $this->totalDefence;
26402662
}
2663+
2664+
/**
2665+
* Set darkElixir1
2666+
*
2667+
* @param integer $darkElixir1
2668+
* @return PlayerHistory
2669+
*/
2670+
public function setDarkElixir1($darkElixir1)
2671+
{
2672+
$this->darkElixir1 = $darkElixir1;
2673+
2674+
return $this;
2675+
}
2676+
2677+
/**
2678+
* Get darkElixir1
2679+
*
2680+
* @return integer
2681+
*/
2682+
public function getDarkElixir1()
2683+
{
2684+
return $this->darkElixir1;
2685+
}
2686+
2687+
/**
2688+
* Set darkElixir2
2689+
*
2690+
* @param integer $darkElixir2
2691+
* @return PlayerHistory
2692+
*/
2693+
public function setDarkElixir2($darkElixir2)
2694+
{
2695+
$this->darkElixir2 = $darkElixir2;
2696+
2697+
return $this;
2698+
}
2699+
2700+
/**
2701+
* Get darkElixir2
2702+
*
2703+
* @return integer
2704+
*/
2705+
public function getDarkElixir2()
2706+
{
2707+
return $this->darkElixir2;
2708+
}
2709+
2710+
/**
2711+
* Set darkElixir3
2712+
*
2713+
* @param integer $darkElixir3
2714+
* @return PlayerHistory
2715+
*/
2716+
public function setDarkElixir3($darkElixir3)
2717+
{
2718+
$this->darkElixir3 = $darkElixir3;
2719+
2720+
return $this;
2721+
}
2722+
2723+
/**
2724+
* Get darkElixir3
2725+
*
2726+
* @return integer
2727+
*/
2728+
public function getDarkElixir3()
2729+
{
2730+
return $this->darkElixir3;
2731+
}
26412732
}

0 commit comments

Comments
 (0)