Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ecologic/tariffs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: uts/tariffs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 9, 2018

  1. Adds code to charge key 

    This avoid conflicts between multiple tariffs of the same type. Note if no code is provided the bug will still occur
    @johnmckibbin
    johnmckibbin committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    d7f45c1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. Fix to allow tariff.code to be None 

    Note though this will cause an error if the same tariff type is used more than once in the same tariff
    @johnmckibbin
    johnmckibbin committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    9d27d75 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from uts/bugfix/conflicting-charges 

    Bugfix/conflicting charges
    @johnmckibbin
    johnmckibbin authored Apr 10, 2018
    Configuration menu
    Copy the full SHA
    2b4948a View commit details
    Browse the repository at this point in the history
Loading