WordPress.org
Get WordPress

Plugin Directory

Changeset 1608221


Ignore:
Timestamp:
03/05/2017 06:31:00 PM (9 years ago)
Author:
robby.roboter
Message:

Fixes

Location:
redi-restaurant-reservation/branches/discount
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • redi-restaurant-reservation/branches/discount/css/restaurant.css

    r1454641 r1608221  
    304304    background-color: #e6e6e6;
    305305    display: inline;
     306    min-height: 58px;
    306307}
    307308

  • redi-restaurant-reservation/branches/discount/redi-restaurant-reservation.php

    r1605455 r1608221  
    15341534                    $comment .= mb_substr( self::GetPost( 'UserComments', '' ), 0, 250 );
    15351535                    $discounts = self::getDiscount(date('d.m.Y', $startTimeInt), date('l', $startTimeInt));
    1536                     $discount = self::getMaxDiscount($discounts, $startTimeInt);
     1536
     1537                    $discount = self::getMaxDiscount($discounts, date( 'H:i', $startTimeInt ));
    15371538
    15381539                    if ($discount) {
    … …  
    15541555                        )
    15551556                    );
     1557
    15561558                    if ( isset( $this->options['EmailFrom'] ) && $this->options['EmailFrom'] == EmailFrom::Disabled ||
    15571559                         isset( $this->options['EmailFrom'] ) && $this->options['EmailFrom'] == EmailFrom::WordPress

  • redi-restaurant-reservation/branches/discount/templates/frontend.php

    r1594181 r1608221  
    108108        <div class="redi-restaurant-button-wrapper">
    109109                <?php if($timeshiftmode != 'byshifts'):?>
    110                     <input class="redi-restaurant-button" id="step1button"style="display:none;" type="submit" value="<?php _e('Check available time', 'redi-restaurant-reservation');?>" name="submit">
     110                    <input class="redi-restaurant-button" id="step1button" style="display:none;" type="submit" value="<?php _e('Check available time', 'redi-restaurant-reservation');?>" name="submit">
    111111                <?php endif?>
    112112            </div>
    … …  
    159159                        <?php $all_busy = true; ?>
    160160
    161                         <?php foreach ( $available['Availability'] as $button ): ?><button title="<?php echo $button['Reason']?>" <?php if(!$button['Available']):?>disabled="disabled"<?php endif?> class="redi-restaurant-time-button button" value="<?php echo $button['StartTimeISO'] ?>"><?php echo $button['StartTime'] ?></button><?php if($button['Available']) $all_busy = false; ?><?php endforeach; ?>
     161                        <?php foreach ( $available['Availability'] as $button ): ?>
     162                            <button title="<?php echo $button['Reason']?>" <?php if(!$button['Available']):?>disabled="disabled"<?php endif?> class="redi-restaurant-time-button button" value="<?php echo $button['StartTimeISO'] ?>">
     163                            <?php echo $button['Discount'] === null ? '' :   $button['Discount'] . '% OFF <br/>' ?>
     164                            <?php echo $button['StartTime'] ?></button><?php if($button['Available']) $all_busy = false; ?>
     165
     166                        <?php endforeach; ?>
    162167
    163168                    <?php endif; ?>
Note: See TracChangeset for help on using the changeset viewer.