| 
                                                        @@ -338,8 +338,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    338
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    338
                                                                                                                                                                                                 | 
                                                                             }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    339
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    339
                                                                                                                                                                                                 | 
                                                                         }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    340
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    340
                                                                                                                                                                                                 | 
                                                                         $playerReward = LeaderboardPlayerReward::where('player_id', $request->player_id)->where('leaderboard_timescope_id', $leaderboardTimescope->id)->whereNotNull('score_sum'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    341
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -            if (!$playerReward)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    342
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -                $playerReward = LeaderboardPlayerReward::make(['leaderboard_timescope_id' => $leaderboardTimescope->id, 'player_id' => $request->player_id]);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    341
                                                                                                                                                                                                 | 
                                                            +            if (!$playerReward) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    342
                                                                                                                                                                                                 | 
                                                            +                            $playerReward = LeaderboardPlayerReward::make(['leaderboard_timescope_id' => $leaderboardTimescope->id, 'player_id' => $request->player_id]);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    343
                                                                                                                                                                                                 | 
                                                            +            }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    343
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    344
                                                                                                                                                                                                 | 
                                                                         $playerReward->score_sum = $rewardedScoreSum;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    344
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    345
                                                                                                                                                                                                 | 
                                                                         $playerReward->save();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    345
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    346
                                                                                                                                                                                                 | 
                                                                     }  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -347,8 +348,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    347
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    348
                                                                                                                                                                                                 | 
                                                                     // Rank reward only report to last LeaderboardTimescope  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    348
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    349
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    349
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    350
                                                                                                                                                                                                 | 
                                                                     // dd ($leaderboardTimescope->previous());  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    350
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        if ($leaderboardTimescope->previous() != null)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    351
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -            $leaderboardTimescope = $leaderboardTimescope->previous();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    351
                                                                                                                                                                                                 | 
                                                            +        if ($leaderboardTimescope->previous() != null) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    352
                                                                                                                                                                                                 | 
                                                            +                    $leaderboardTimescope = $leaderboardTimescope->previous();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    353
                                                                                                                                                                                                 | 
                                                            +        }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    352
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    354
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    353
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    355
                                                                                                                                                                                                 | 
                                                                     $playerReward = LeaderboardPlayerReward::firstOrNew(['player_id' => $request->player_id, 'leaderboard_timescope_id' => $leaderboardTimescope->id]);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    354
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    356
                                                                                                                                                                                                 | 
                                                                     if ($request->has('rank')) { | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.